Second Life viewer sources 1.19.1.2

1 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 0f48d7d..d531455 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -885,13 +885,15 @@ void init_client_menu(LLMenuGL* menu)
                                                                                 NULL,
                                                                                 &get_visibility,
                                                                                 (void*)gDebugView->mFastTimerView,
-                                                                                '9', MASK_CONTROL|MASK_SHIFT ) );
+                                                                                  '9', MASK_CONTROL|MASK_SHIFT ) );
+#if MEM_TRACK_MEM
                 sub->append(new LLMenuItemCheckGL("Memory", 
                                                                                 &toggle_visibility,
                                                                                 NULL,
                                                                                 &get_visibility,
                                                                                 (void*)gDebugView->mMemoryView,
-                                                                                '0', MASK_CONTROL|MASK_SHIFT ) );
+                                                                                  '0', MASK_CONTROL|MASK_SHIFT ) );
+#endif
                 sub->appendSeparator();
                 sub->append(new LLMenuItemCallGL("Region Info to Debug Console", 
                         &handle_region_dump_settings, NULL));
@@ -1099,6 +1101,12 @@ void init_client_menu(LLMenuGL* menu)
                 menu->appendMenu(sub);
         }
 
+        menu->append(new LLMenuItemCheckGL( "Output Debug Minidump", 
+                                                                                &menu_toggle_control,
+                                                                                NULL, 
+                                                                                &menu_check_control,
+                                                                                (void*)"SaveMinidump"));
+
         // TomY Temporary menu item so we can test this floater
         menu->append(new LLMenuItemCheckGL("Clothing...", 
                                                                                                 &handle_clothing,
@@ -5263,7 +5271,7 @@ class LLShowFloater : public view_listener_t
                 {
                         if (gAgent.getWearablesLoaded())
                         {
-                                gAgent.changeCameraToCustomizeAvatar(gSavedSettings.getBOOL("AppearanceCameraMovement"));
+                                gAgent.changeCameraToCustomizeAvatar();
                         }
                 }
                 else if (floater_name == "friends")