From 7f9aa65bfb03113f886ecf216bc01fcfd15f86a5 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 21 Sep 2007 20:07:49 +0000
Subject: svn merge -r69926:70272 lag-meter, to pick up fixes for shrunk view,
 icon layout and ping time testing.  QA passed by Devin.

---
 indra/newview/llfloaterlagmeter.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterlagmeter.h')

diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h
index 72766fec85..2bf0cdb9e3 100644
--- a/indra/newview/llfloaterlagmeter.h
+++ b/indra/newview/llfloaterlagmeter.h
@@ -27,7 +27,7 @@ private:
 
 	static void onClickShrink(void * data);
 
-	bool mMinimized;
+	bool mShrunk;
 	S32 mMaxWidth, mMinWidth;
 
 	F32 mClientFrameTimeCritical;
@@ -38,6 +38,8 @@ private:
 
 	F32 mNetworkPacketLossCritical;
 	F32 mNetworkPacketLossWarning;
+	F32 mNetworkPingCritical;
+	F32 mNetworkPingWarning;
 	LLButton * mNetworkButton;
 	LLTextBox * mNetworkText;
 	LLTextBox * mNetworkCause;
-- 
cgit v1.2.3