summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamera.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-10-23 16:44:23 -0700
committerJames Cook <james@lindenlab.com>2009-10-23 16:44:23 -0700
commit07f7247dff19cb7acd320113734773c099b0366d (patch)
tree7072f301675db427686c06eca48592b89d4db227 /indra/newview/llfloatercamera.h
parent71822edfe824c5f7c742d6d9b8528f8ff541963b (diff)
parent2b69cb9e9cf5209a8156580b74e6662e4cc4243f (diff)
merge
Diffstat (limited to 'indra/newview/llfloatercamera.h')
-rw-r--r--indra/newview/llfloatercamera.h13
1 files changed, 2 insertions, 11 deletions
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