From 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 7 Jul 2009 00:53:05 +0000 Subject: Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14 --- indra/newview/llfloatercamera.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index f954e329eb..daea9ecee1 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -40,12 +40,12 @@ class LLJoystickCameraZoom; class LLJoystickCameraTrack; class LLFloaterCamera - : public LLFloater, - public LLFloaterSingleton + : public LLFloater { - friend class LLUISingleton >; + friend class LLFloaterReg; private: + LLFloaterCamera(const LLSD& val); ~LLFloaterCamera() {}; @@ -53,6 +53,7 @@ private: /*virtual*/ void onClose(bool app_quitting); /*virtual*/ BOOL postBuild(); public: + LLJoystickCameraRotate* mRotate; LLJoystickCameraZoom* mZoom; LLJoystickCameraTrack* mTrack; -- cgit v1.2.3 From e4dc104e3296319476bb0d6c327d6a326c967976 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 10 Jul 2009 21:18:42 +0000 Subject: EXT-70 Camera and Movement controls don't save their positions DEV-35250 Quitting from the login screen forgets window placement and visibility (e.g. movement and camera floaters) reviewed by Leyla --- indra/newview/llfloatercamera.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index daea9ecee1..fabe8f577e 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -49,8 +49,6 @@ private: LLFloaterCamera(const LLSD& val); ~LLFloaterCamera() {}; - /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ void onClose(bool app_quitting); /*virtual*/ BOOL postBuild(); public: -- cgit v1.2.3