From baa51d59e1ea6653879079cd1393d7791d27e268 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 19 Sep 2007 04:52:01 +0000
Subject: 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.

---
 indra/newview/llviewermenu.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llviewermenu.cpp')

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");
-- 
cgit v1.2.3