diff options
| author | Richard Linden <none@none> | 2013-01-09 23:46:33 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-09 23:46:33 -0800 |
| commit | beb431c7834f49d8e6b5304f7b60fb1f1b3b4afe (patch) | |
| tree | e268ef1a5116760093fe4f4e132c0e3c0a74ccdc /indra/newview/llviewermenu.cpp | |
| parent | a891785f7a02098a53029311befd7083773d6ad8 (diff) | |
| parent | 0c3df70dffdc6b19abaa91bfd14f2d08a66e95dd (diff) | |
Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 3ca410cf73..9a0cb432be 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -122,6 +122,7 @@ #include "llwindow.h" #include "llpathfindingmanager.h" #include "boost/unordered_map.hpp" +#include "llscenemonitor.h" using namespace LLVOAvatarDefines; @@ -529,7 +530,10 @@ class LLAdvancedToggleConsole : public view_listener_t { toggle_visibility( (void*)gSceneView); } - + else if ("scene monitor" == console_type) + { + toggle_visibility( (void*)gSceneMonitorView); + } #if MEM_TRACK_MEM else if ("memory view" == console_type) { @@ -557,9 +561,9 @@ class LLAdvancedCheckConsole : public view_listener_t { new_value = LLFloaterReg::instanceVisible("fast_timers"); } - else if ("scene view" == console_type) + else if ("scene monitor" == console_type) { - new_value = get_visibility( (void*) gSceneView); + new_value = get_visibility( (void*) gSceneMonitorView); } #if MEM_TRACK_MEM else if ("memory view" == console_type) |