diff options
| author | James Cook <james@lindenlab.com> | 2007-09-19 04:52:01 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-09-19 04:52:01 +0000 |
| commit | baa51d59e1ea6653879079cd1393d7791d27e268 (patch) | |
| tree | 348554fafe5a6d2b14aedb120ae3c30348c78118 /indra/newview/llviewermenu.cpp | |
| parent | e3d0761b5eb2ead6ccaa1bcd871b754c5e5ff65c (diff) | |
svn merge -r 69906:69926 svn+ssh://svn.lindenlab.com/svn/linden/branches/lag-meter. Adds "Lag Meter" option to "Help" menu to give users more useful diagnostics when they see "laggy" behavior.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 21a334e70b..c242d855f1 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -85,6 +85,7 @@ #include "llfloaterhtmlhelp.h" #include "llfloaterhtmlfind.h" #include "llfloaterinspect.h" +#include "llfloaterlagmeter.h" #include "llfloaterland.h" #include "llfloaterlandholdings.h" #include "llfloatermap.h" @@ -5514,6 +5515,10 @@ class LLShowFloater : public view_listener_t LLFloaterBump::show(NULL); } } + else if (floater_name == "lag meter") + { + LLFloaterLagMeter::show(NULL); + } else if (floater_name == "bug reporter") { // Prevent menu from appearing in screen shot. @@ -7760,6 +7765,7 @@ void initialize_menus() // Help menu addMenu(new LLHelpMOTD(), "Help.MOTD"); + // most items use the ShowFloater method // Self pie menu addMenu(new LLSelfStandUp(), "Self.StandUp"); |