Attachment #107600 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch




	LLFilePicker::ELoadFilter type;
	if(data)
	{
		type = (LLFilePicker::ELoadFilter)((long)data);
	}
	else
	{


BOOL menu_check_build_tool( void* user_data )
{
	long index = (long) user_data;
	return gCurrentToolset->isToolSelected( index );
}


	{
		bool new_value = false;
		LLViewerObject* dest_object = NULL;
		if((dest_object = gObjectList.findObject(gLastHitObjectID)))
		{
			if(dest_object->getPCode() == LL_PCODE_VOLUME)
			{


void handle_grab_texture(void* data)
{
	LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((long) data);
	LLVOAvatar* avatar = gAgent.getAvatarObject();
	if ( avatar )
	{


BOOL enable_grab_texture(void* data)
{
	LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((long) data);
	LLVOAvatar* avatar = gAgent.getAvatarObject();
	if ( avatar )
	{

Return to bug 127026

Lines 5025-5031 Link Here

(-)linden/indra/newview/llviewermenu.cpp.orig (-5 / +5 lines)
5025	LLFilePicker::ELoadFilter type;	5025	LLFilePicker::ELoadFilter type;
5026	if(data)	5026	if(data)
5027	{	5027	{
5028	type = (LLFilePicker::ELoadFilter)((S32)data);	5028	type = (LLFilePicker::ELoadFilter)((long)data);
5029	}	5029	}
5030	else	5030	else
5031	{	5031	{
Lines 5930-5936 Link Here
5930		5930
5931	BOOL menu_check_build_tool( void* user_data )	5931	BOOL menu_check_build_tool( void* user_data )
5932	{	5932	{
5933	S32 index = (S32) user_data;	5933	long index = (long) user_data;
5934	return gCurrentToolset->isToolSelected( index );	5934	return gCurrentToolset->isToolSelected( index );
5935	}	5935	}
5936		5936
Lines 6223-6229 Link Here
6223	{	6223	{
6224	bool new_value = false;	6224	bool new_value = false;
6225	LLViewerObject* dest_object = NULL;	6225	LLViewerObject* dest_object = NULL;
6226	if(dest_object = gObjectList.findObject(gLastHitObjectID))	6226	if((dest_object = gObjectList.findObject(gLastHitObjectID)))
6227	{	6227	{
6228	if(dest_object->getPCode() == LL_PCODE_VOLUME)	6228	if(dest_object->getPCode() == LL_PCODE_VOLUME)
6229	{	6229	{
Lines 8075-8081 Link Here
8075		8075
8076	void handle_grab_texture(void* data)	8076	void handle_grab_texture(void* data)
8077	{	8077	{
8078	LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data);	8078	LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((long) data);
8079	LLVOAvatar* avatar = gAgent.getAvatarObject();	8079	LLVOAvatar* avatar = gAgent.getAvatarObject();
8080	if ( avatar )	8080	if ( avatar )
8081	{	8081	{
Lines 8166-8172 Link Here
8166		8166
8167	BOOL enable_grab_texture(void* data)	8167	BOOL enable_grab_texture(void* data)
8168	{	8168	{
8169	LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data);	8169	LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((long) data);
8170	LLVOAvatar* avatar = gAgent.getAvatarObject();	8170	LLVOAvatar* avatar = gAgent.getAvatarObject();
8171	if ( avatar )	8171	if ( avatar )
8172	{	8172	{