From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:16:27 +0000
Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3

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

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

diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h
index e8af68ac7a..6d2086839e 100644
--- a/indra/newview/llfloaterlagmeter.h
+++ b/indra/newview/llfloaterlagmeter.h
@@ -42,17 +42,18 @@ class LLFloaterLagMeter : public LLFloater, public LLFloaterSingleton<LLFloaterL
 	friend class LLUISingleton<LLFloaterLagMeter, VisibilityPolicy<LLFloater> >;
 	
 public:
+	LLFloaterLagMeter(const LLSD& key);
+	/*virtual*/ ~LLFloaterLagMeter();
+
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL postBuild();	
 private:
-	LLFloaterLagMeter(const LLSD& key);
-	/*virtual*/ ~LLFloaterLagMeter();
 
 	void determineClient();
 	void determineNetwork();
 	void determineServer();
 
-	static void onClickShrink(void * data);
+	void onClickShrink();
 
 	bool mShrunk;
 	S32 mMaxWidth, mMinWidth;
-- 
cgit v1.2.3