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.

1 files changed, 55 insertions, 0 deletions

diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h
new file mode 100644
index 0000000000..72766fec85
--- /dev/null
+++ b/indra/newview/llfloaterlagmeter.h
@@ -0,0 +1,55 @@
+/** 
+ * @file llfloaterlagmeter.h
+ * @brief The "Lag-o-Meter" floater used to tell users what is causing lag.
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LLFLOATERLAGMETER_H
+#define LLFLOATERLAGMETER_H
+
+#include "llfloater.h"
+
+class LLFloaterLagMeter : public LLFloater
+{
+public:
+	/*virtual*/ void draw();
+	static void show(void*);
+
+private:
+	LLFloaterLagMeter();
+	/*virtual*/ ~LLFloaterLagMeter();
+
+	void determineClient();
+	void determineNetwork();
+	void determineServer();
+
+	static void onClickShrink(void * data);
+
+	bool mMinimized;
+	S32 mMaxWidth, mMinWidth;
+
+	F32 mClientFrameTimeCritical;
+	F32 mClientFrameTimeWarning;
+	LLButton * mClientButton;
+	LLTextBox * mClientText;
+	LLTextBox * mClientCause;
+
+	F32 mNetworkPacketLossCritical;
+	F32 mNetworkPacketLossWarning;
+	LLButton * mNetworkButton;
+	LLTextBox * mNetworkText;
+	LLTextBox * mNetworkCause;
+
+	F32 mServerFrameTimeCritical;
+	F32 mServerFrameTimeWarning;
+	F32 mServerSingleProcessMaxTime;
+	LLButton * mServerButton;
+	LLTextBox * mServerText;
+	LLTextBox * mServerCause;
+
+	static LLFloaterLagMeter * sInstance;
+};
+
+#endif