summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamera.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-07-12 19:47:44 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-07-12 19:47:44 +0300
commiteb6153d2c3cb1e2105804e28f81f894873315545 (patch)
tree876595c00478e8f2fd9a6041134dcc43a498b23a /indra/newview/llfloatercamera.cpp
parent36d5c91f7c19d85ca07d9e96357406e74c812687 (diff)
EXT-7796 FIXED disabling/enabling presets and camera modes on switching to/from camera customize mode
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/732/ --HG-- branch : product-engine
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();