diff options
Diffstat (limited to 'indra/newview/llfloatercamera.h')
| -rw-r--r-- | indra/newview/llfloatercamera.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 1181c443bf..020cae7e82 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -33,7 +33,7 @@ #ifndef LLFLOATERCAMERA_H #define LLFLOATERCAMERA_H -#include "llfloater.h" +#include "lldockablefloater.h" #include "llfirsttimetipmanager.h" @@ -51,7 +51,7 @@ enum ECameraControlMode }; class LLFloaterCamera - : public LLFloater + : public LLDockableFloater { friend class LLFloaterReg; @@ -70,14 +70,8 @@ public: static void updateIfNotInAvatarViewMode(); - static void onClickCameraPresets(LLUICtrl* ctrl, const LLSD& param); - virtual void onOpen(const LLSD& key); - // *HACK: due to hard enough to have this control aligned with "Camera" button while resizing - // let update its position in each frame - /*virtual*/ void draw(){updatePosition(); LLFloater::draw();} - LLJoystickCameraRotate* mRotate; LLJoystickCameraZoom* mZoom; LLJoystickCameraTrack* mTrack; @@ -113,9 +107,6 @@ private: void assignButton2Mode(ECameraControlMode mode, const std::string& button_name); void initMode2TipTypeMap(); - /*Updates position of the floater to be center aligned with "Camera" button.*/ - void updatePosition(); - ECameraControlMode mPrevMode; ECameraControlMode mCurrMode; @@ -124,4 +115,15 @@ private: }; +class LLFloaterCameraPresets : public LLDockableFloater +{ + friend class LLFloaterReg; +public: + static void onClickCameraPresets(LLUICtrl* ctrl, const LLSD& param); +private: + LLFloaterCameraPresets(const LLSD&); + ~LLFloaterCameraPresets(){} + /*virtual*/ BOOL postBuild(); + +}; #endif |