diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-29 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-29 19:37:05 +0000 |
| commit | 606b381c9fbc43c214afd26fb2e2598eec656b66 (patch) | |
| tree | 422a6d5d94d50bd97ac5bcbdb52f0f6de083c6e7 /indra/newview/llfloatercamera.h | |
| parent | 751cc7cf68bb4d766e8ecaaf76af054dcfbbe9dc (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180
* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator
QA NOTES:
* Message Well Window is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
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 |