summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamera.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-15 08:54:55 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-15 08:54:55 +0100
commitdee93e85601bce555784f07eb83e97aef45ec9b5 (patch)
tree84a561d48e9ec2dcec59e435850756d727a8e266 /indra/newview/llfloatercamera.cpp
parentb46fff1ba1450d14424e676f31c0cacd921bedb0 (diff)
parent56af80a2c9991b5dd08066b132b1e4517558f056 (diff)
merge from PE's viewer-trunk (viewer-public)
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
-rw-r--r--indra/newview/llfloatercamera.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index d6effb2b21..0fa536dfad 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -243,6 +243,20 @@ void LLFloaterCamera::resetCameraMode()
floater_camera->switchMode(CAMERA_CTRL_MODE_PAN);
}
+void LLFloaterCamera::onAvatarEditingAppearance(bool editing)
+{
+ LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
+ if (!floater_camera) return;
+
+ //camera presets (rear, front, etc.)
+ floater_camera->childSetEnabled("preset_views_list", !editing);
+ floater_camera->childSetEnabled("presets_btn", !editing);
+
+ //camera modes (object view, mouselook view)
+ floater_camera->childSetEnabled("camera_modes_list", !editing);
+ floater_camera->childSetEnabled("avatarview_btn", !editing);
+}
+
void LLFloaterCamera::update()
{
ECameraControlMode mode = determineMode();