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-enginemeow-7.2.2
parent
36d5c91f7c
commit
eb6153d2c3
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue