From fe9719e8047e288bfb97068b7addd5dc50ffa739 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 21 Oct 2009 03:39:04 +0000 Subject: Merging revisions 2094-2099 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1612 EXT-1604 EXT-1163 EXT-1163 EXT-1167 * Dev: EXT-1516 --- indra/newview/llfloatercamera.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 69df861a20..30a6b552f2 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -69,6 +69,7 @@ public: static void updateIfNotInAvatarViewMode(); virtual void onOpen(const LLSD& key); + virtual void onClose(bool app_quitting); LLJoystickCameraRotate* mRotate; LLJoystickCameraZoom* mZoom; -- cgit v1.2.3 From 2c1aacf814142b23049eff2a691a7cd2902bcf1d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 21 Oct 2009 04:47:55 +0000 Subject: 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 --- indra/newview/llfloatercamera.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloatercamera.h') 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: -- cgit v1.2.3 From b43771cad585cb9820941eb1b24b67390eaa9435 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 23 Oct 2009 17:20:45 +0000 Subject: Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572 * Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747 --- indra/newview/llfloatercamera.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index ba943e66ed..583f279e62 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -57,6 +57,8 @@ public: /* whether in free camera mode */ static bool inFreeCameraMode(); + /* callback for camera presets changing */ + static void onClickCameraPresets(const LLSD& param); static void toPrevModeIfInAvatarViewMode(); @@ -112,15 +114,4 @@ private: }; -class LLFloaterCameraPresets : public LLTransientDockableFloater -{ - friend class LLFloaterReg; -public: - static void onClickCameraPresets(LLUICtrl* ctrl, const LLSD& param); -private: - LLFloaterCameraPresets(const LLSD&); - ~LLFloaterCameraPresets(){} - /*virtual*/ BOOL postBuild(); - -}; #endif -- cgit v1.2.3