1 files changed, 8 insertions, 16 deletions

diff --git a/linden/indra/newview/llmoveview.h b/linden/indra/newview/llmoveview.h
index 2683e62..a3a4ad1 100644
--- a/linden/indra/newview/llmoveview.h
+++ b/linden/indra/newview/llmoveview.h
@@ -43,23 +43,20 @@ 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 void onFlyButtonClicked(void* userdata);
-        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; }
+        static F32      getYawRate(F32 time);
 
 protected:
         static void turnLeftNudge(void* userdata);
@@ -72,8 +69,6 @@ protected:
         static void moveDown(void* userdata);
 
 public:
-        LLButton*                               mFlyButton;
-
         LLJoystickAgentTurn*    mForwardButton;
         LLJoystickAgentTurn*    mBackwardButton;
         LLJoystickAgentSlide*   mSlideLeftButton;
@@ -82,9 +77,6 @@ public:
         LLButton*                               mTurnRightButton;
         LLButton*                               mMoveUpButton;
         LLButton*                               mMoveDownButton;
-
-protected:
-        static LLFloaterMove*   sInstance;
 };