diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
| commit | 682609d254fb973cfa267923b69c5e06b7efd7e1 (patch) | |
| tree | 0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/newview/llmoveview.h | |
| parent | 3596c0f7e139724f31258ffb96157146aeba77b1 (diff) | |
| parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llmoveview.h')
| -rw-r--r-- | indra/newview/llmoveview.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index 1b87864651..744dd866d4 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -28,7 +28,7 @@ #define LL_LLMOVEVIEW_H // Library includes -#include "lltransientdockablefloater.h" +#include "llfloater.h" class LLButton; class LLJoystickAgentTurn; @@ -38,7 +38,7 @@ class LLJoystickAgentSlide; // Classes // class LLFloaterMove -: public LLTransientDockableFloater +: public LLFloater { LOG_CLASS(LLFloaterMove); friend class LLFloaterReg; @@ -58,7 +58,6 @@ public: static void setSittingMode(BOOL bSitting); static void enableInstance(BOOL bEnable); /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ void setDocked(bool docked, bool pop_on_undock = true); static void sUpdateFlyingStatus(); @@ -87,7 +86,6 @@ private: void initModeButtonMap(); void setModeButtonToggleState(const EMovementMode mode); void updateButtonsWithMovementMode(const EMovementMode newMode); - void updatePosition(); void showModeButtons(BOOL bShow); public: |