diff options
| author | Richard Linden <none@none> | 2013-01-11 13:15:39 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 13:15:39 -0800 |
| commit | a3d07fd4c27e527edfb901b25b5857d3fd7d2eaf (patch) | |
| tree | 306b27137fe029cafe4d65f0c24fc65820e1ab9a /indra/newview/llviewermenu.cpp | |
| parent | dd54893bcf50f41e5c678b6ca67b646284b94fca (diff) | |
| parent | 17c051f965e05a8a91d4a93b641084869897fe71 (diff) | |
Automated merge with file:///c:%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) |