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
meow-7.2.2
Igor Borovkov 2010-07-12 19:47:44 +03:00
parent 36d5c91f7c
commit eb6153d2c3
3 changed files with 21 additions and 0 deletions

View File

@ -1785,6 +1785,8 @@ void LLAgent::endAnimationUpdateUI()
}
gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR);
LLFloaterCamera::onAvatarEditingAppearance(false);
}
//---------------------------------------------------------------------
@ -1891,6 +1893,8 @@ void LLAgent::endAnimationUpdateUI()
{
mPauseRequest = gAgentAvatarp->requestPause();
}
LLFloaterCamera::onAvatarEditingAppearance(true);
}
if (isAgentAvatarValid())

View File

@ -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();

View File

@ -68,6 +68,9 @@ public:
/** resets current camera mode to orbit mode */
static void resetCameraMode();
/** Called when Avatar is entered/exited editing appearance mode */
static void onAvatarEditingAppearance(bool editing);
/* determines actual mode and updates ui */
void update();