1 files changed, 18 insertions, 76 deletions

diff --git a/linden/indra/newview/llmoveview.cpp b/linden/indra/newview/llmoveview.cpp
index 5444a6e..0bb0a5e 100644
--- a/linden/indra/newview/llmoveview.cpp
+++ b/linden/indra/newview/llmoveview.cpp
@@ -39,12 +39,10 @@
 // Viewer includes
 #include "llagent.h"
 #include "llviewercontrol.h"
-#include "llfontgl.h"
 #include "llbutton.h"
 #include "llviewerwindow.h"
 #include "lljoystickbutton.h"
-#include "llresmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 
 //
 // Constants
@@ -54,68 +52,48 @@ const F32 MOVE_BUTTON_DELAY = 0.0f;
 const F32 YAW_NUDGE_RATE = 0.05f;       // fraction of normal speed
 const F32 NUDGE_TIME = 0.25f;           // in seconds
 
-const char *MOVE_TITLE = "";
-
-//
-// Global statics
-//
-
-LLFloaterMove* LLFloaterMove::sInstance = NULL;
-
-
 //
 // Member functions
 //
 
 // protected
-LLFloaterMove::LLFloaterMove()
-:       LLFloater("move floater", "FloaterMoveRect", MOVE_TITLE, FALSE, 100, 100, DRAG_ON_TOP,
-                          MINIMIZE_NO)
+LLFloaterMove::LLFloaterMove(const LLSD& key)
+:       LLFloater("move floater")
 {
         setIsChrome(TRUE);
-        gUICtrlFactory->buildFloater(this,"floater_moveview.xml"); 
 
-        mForwardButton = LLViewerUICtrlFactory::getJoystickAgentTurnByName(this, "forward btn"); 
+        const BOOL DONT_OPEN = FALSE;
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", NULL, DONT_OPEN); 
+
+        mForwardButton = getChild<LLJoystickAgentTurn>("forward btn"); 
         mForwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
-        mBackwardButton = LLViewerUICtrlFactory::getJoystickAgentTurnByName(this, "backward btn"); 
+        mBackwardButton = getChild<LLJoystickAgentTurn>("backward btn"); 
         mBackwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
-        mSlideLeftButton = LLViewerUICtrlFactory::getJoystickAgentSlideByName(this, "slide left btn"); 
+        mSlideLeftButton = getChild<LLJoystickAgentSlide>("slide left btn"); 
         mSlideLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
-        mSlideRightButton = LLViewerUICtrlFactory::getJoystickAgentSlideByName(this, "slide right btn"); 
+        mSlideRightButton = getChild<LLJoystickAgentSlide>("slide right btn"); 
         mSlideRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
-        mTurnLeftButton = LLUICtrlFactory::getButtonByName(this, "turn left btn"); 
+        mTurnLeftButton = getChild<LLButton>("turn left btn"); 
         mTurnLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
         mTurnLeftButton->setHeldDownCallback( turnLeft );
 
-        mTurnRightButton = LLUICtrlFactory::getButtonByName(this, "turn right btn"); 
+        mTurnRightButton = getChild<LLButton>("turn right btn"); 
         mTurnRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
         mTurnRightButton->setHeldDownCallback( turnRight );
 
-        mMoveUpButton = LLUICtrlFactory::getButtonByName(this, "move up btn"); 
+        mMoveUpButton = getChild<LLButton>("move up btn"); 
         childSetAction("move up btn",moveUp,NULL);
         mMoveUpButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
         mMoveUpButton->setHeldDownCallback( moveUp );
 
-        mMoveDownButton = LLUICtrlFactory::getButtonByName(this, "move down btn"); 
+        mMoveDownButton = getChild<LLButton>("move down btn"); 
         childSetAction("move down btn",moveDown,NULL);  
         mMoveDownButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
         mMoveDownButton->setHeldDownCallback( moveDown );
-
-        mFlyButton = LLUICtrlFactory::getButtonByName(this, "fly btn"); 
-        childSetAction("fly btn",onFlyButtonClicked,NULL);
-
-        sInstance = this;
-}
-
-// protected
-LLFloaterMove::~LLFloaterMove()
-{
-        // children all deleted by LLView destructor
-        sInstance = NULL;
 }
 
 // virtual
@@ -133,48 +111,12 @@ void LLFloaterMove::onClose(bool app_quitting)
 // Static member functions
 //
 
-// static
-void LLFloaterMove::show(void*)
+void LLFloaterMove::onOpen()
 {
-        if (sInstance)
-        {
-                sInstance->open();      /*Flawfinder: ignore*/
-        }
-        else
-        {
-                LLFloaterMove* f = new LLFloaterMove();
-                f->open();      /*Flawfinder: ignore*/
-        }
-        
+        LLFloater::onOpen();
         gSavedSettings.setBOOL("ShowMovementControls", TRUE);
 }
 
-// static
-void LLFloaterMove::toggle(void*)
-{
-        if (sInstance)
-        {
-                sInstance->close();
-        }
-        else
-        {
-                show(NULL);
-        }
-}
-
-// static
-BOOL LLFloaterMove::visible(void*)
-{
-        return (sInstance != NULL);
-}
-
-// protected static 
-void LLFloaterMove::onFlyButtonClicked(void *)
-{
-        gAgent.toggleFlying();
-}
-
-
 // protected static 
 F32 LLFloaterMove::getYawRate( F32 time )
 {
@@ -192,14 +134,14 @@ F32 LLFloaterMove::getYawRate( F32 time )
 // protected static 
 void LLFloaterMove::turnLeft(void *)
 {
-        F32 time = sInstance->mTurnLeftButton->getHeldDownTime();
+        F32 time = getInstance()->mTurnLeftButton->getHeldDownTime();
         gAgent.moveYaw( getYawRate( time ) );
 }
 
 // protected static 
 void LLFloaterMove::turnRight(void *)
 {
-        F32 time = sInstance->mTurnRightButton->getHeldDownTime();
+        F32 time = getInstance()->mTurnRightButton->getHeldDownTime();
         gAgent.moveYaw( -getYawRate( time ) );
 }