diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-15 08:54:55 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-15 08:54:55 +0100 |
| commit | dee93e85601bce555784f07eb83e97aef45ec9b5 (patch) | |
| tree | 84a561d48e9ec2dcec59e435850756d727a8e266 /indra/newview/llagent.cpp | |
| parent | b46fff1ba1450d14424e676f31c0cacd921bedb0 (diff) | |
| parent | 56af80a2c9991b5dd08066b132b1e4517558f056 (diff) | |
merge from PE's viewer-trunk (viewer-public)
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 72d51540ef..53b7febba7 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -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()) |