diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-18 00:36:25 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-18 00:36:25 +0000 |
| commit | 73f0b5029aa247a563862fc39152ce58baa407aa (patch) | |
| tree | 656b4b9d02c3c81d184ebf2915fe8c073e9335e2 /indra/newview/llviewermenu.cpp | |
| parent | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (diff) | |
merge -r 56738:56842 maintenance.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index a899d3d3d2..5ce64156a0 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1203,7 +1203,7 @@ void init_debug_rendering_menu(LLMenuGL* menu) menu->append(item); - item = new LLMenuItemCheckGL("Animate Textures", menu_toggle_control, NULL, menu_check_control, (void*)"AnimateTextures", 'A', MASK_CONTROL|MASK_ALT); + item = new LLMenuItemCheckGL("Animate Textures", menu_toggle_control, NULL, menu_check_control, (void*)"AnimateTextures"); menu->append(item); item = new LLMenuItemCheckGL("Disable Textures", menu_toggle_variable, NULL, menu_check_variable, (void*)&LLViewerImage::sDontLoadVolumeTextures); @@ -5006,7 +5006,7 @@ const char* upload_pick(void* data) LLFilePicker::ELoadFilter type; if(data) { - type = (LLFilePicker::ELoadFilter)((S32)data); + type = (LLFilePicker::ELoadFilter)((intptr_t)data); } else { @@ -5911,7 +5911,7 @@ void handle_export_selected( void * ) BOOL menu_check_build_tool( void* user_data ) { - S32 index = (S32) user_data; + S32 index = (intptr_t) user_data; return gCurrentToolset->isToolSelected( index ); } @@ -6204,7 +6204,7 @@ class LLObjectEnableSitOrStand : public view_listener_t { bool new_value = false; LLViewerObject* dest_object = NULL; - if(dest_object = gObjectList.findObject(gLastHitObjectID)) + if((dest_object = gObjectList.findObject(gLastHitObjectID))) { if(dest_object->getPCode() == LL_PCODE_VOLUME) { @@ -8056,7 +8056,7 @@ void handle_debug_avatar_textures(void*) void handle_grab_texture(void* data) { - LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data); + LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data); LLVOAvatar* avatar = gAgent.getAvatarObject(); if ( avatar ) { @@ -8147,7 +8147,7 @@ void handle_grab_texture(void* data) BOOL enable_grab_texture(void* data) { - LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data); + LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data); LLVOAvatar* avatar = gAgent.getAvatarObject(); if ( avatar ) { @@ -8246,6 +8246,7 @@ BOOL LLViewerMenuHolderGL::hideMenus() } gMenuBarView->clearHoverItem(); gMenuBarView->resetMenuTrigger(); + return handled; } |