diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-21 16:57:37 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-27 20:15:14 +0200 |
| commit | 02dba611b21f1a1e72083ab36475b627489779e7 (patch) | |
| tree | b6088791aa689eecb90955cc6f3b9344d9f57fa3 /indra/newview/llagentcamera.cpp | |
| parent | 08b75b5ee72518ae423be0838ace61a148d4bb7a (diff) | |
SL-10326 Develop submenu option Allow Select Avatar was defective
Viewer should now filter out position changes from server when avatar is being edited.
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 85b7d7b06f..26b60b89f5 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -355,6 +355,18 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) } mHUDTargetZoom = 1.f; + + if (LLSelectMgr::getInstance()->mAllowSelectAvatar) + { + // resetting camera also resets position overrides in debug mode 'AllowSelectAvatar' + LLObjectSelectionHandle selected_handle = LLSelectMgr::getInstance()->getSelection(); + if (selected_handle->getObjectCount() == 1 + && selected_handle->getFirstObject() != NULL + && selected_handle->getFirstObject()->isAvatar()) + { + LLSelectMgr::getInstance()->resetObjectOverrides(selected_handle); + } + } } // Allow camera to be moved somewhere other than behind avatar. |