diff options
| author | Richard Linden <none@none> | 2013-01-10 00:55:13 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 00:55:13 -0800 |
| commit | 6bf1e9f585fc945ee60501e69f75a12fd7d320cb (patch) | |
| tree | b8cf0e7024c8e77bcdda93ef11682f141b21a378 /indra/newview/llviewermenu.cpp | |
| parent | 7b0762984a4c49595445ed3a5a113c3f0aa17181 (diff) | |
| parent | 2ac49344e1aea94a11ecdb07ac6043538246a2f6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-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) |