diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:47:55 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:47:55 +0000 |
| commit | 2c1aacf814142b23049eff2a691a7cd2902bcf1d (patch) | |
| tree | 21d9890a07996bfa983a094f1003b6f8a0277332 /indra/newview/llfloatercamera.h | |
| parent | 044557a853ba70bfa80392b48936523528abda5f (diff) | |
Merging revisions 2102-2104 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1609 EXT-1255 EXT-1299
Diffstat (limited to 'indra/newview/llfloatercamera.h')
| -rw-r--r-- | indra/newview/llfloatercamera.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 30a6b552f2..ba943e66ed 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -33,7 +33,7 @@ #ifndef LLFLOATERCAMERA_H #define LLFLOATERCAMERA_H -#include "lldockablefloater.h" +#include "lltransientdockablefloater.h" class LLJoystickCameraRotate; class LLJoystickCameraZoom; @@ -49,7 +49,7 @@ enum ECameraControlMode }; class LLFloaterCamera - : public LLDockableFloater + : public LLTransientDockableFloater { friend class LLFloaterReg; @@ -112,7 +112,7 @@ private: }; -class LLFloaterCameraPresets : public LLDockableFloater +class LLFloaterCameraPresets : public LLTransientDockableFloater { friend class LLFloaterReg; public: |