From c57beb8b4bd51add9a92ddc4d704e7bea9c4d940 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 17 Apr 2008 02:06:30 +0000
Subject: QAR-449 Viewer 1.20 RC 0 merge Branch_1-20-Viewer -r 84060 : 84432 ->
 release

---
 indra/newview/llmoveview.h | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 4d55206194..17005e0ded 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -43,24 +43,21 @@ class LLJoystickAgentSlide;
 // Classes
 //
 class LLFloaterMove
-:	public LLFloater
+:	public LLFloater, 
+	public LLFloaterSingleton<LLFloaterMove>
 {
+	friend class LLUISingleton<LLFloaterMove, VisibilityPolicy<LLFloater> >;
+	
 protected:
-	LLFloaterMove();
-	~LLFloaterMove();
+	LLFloaterMove(const LLSD& key);
+	~LLFloaterMove() {}
 
 public:
+	/*virtual*/ void onOpen();
 	/*virtual*/ void onClose(bool app_quitting);
 
 	static F32	getYawRate(F32 time);
 
-	static void show(void*);
-	static void toggle(void*);
-	static BOOL visible(void*);
-	
-	// This function is used for agent-driven button highlighting
-	static LLFloaterMove* getInstance()				{ return sInstance; }
-
 protected:
 	static void turnLeftNudge(void* userdata);
 	static void turnLeft(void* userdata);
@@ -80,9 +77,6 @@ public:
 	LLButton*				mTurnRightButton;
 	LLButton*				mMoveUpButton;
 	LLButton*				mMoveDownButton;
-
-protected:
-	static LLFloaterMove*	sInstance;
 };
 
 
-- 
cgit v1.2.3