diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
| commit | 2efe91ef64a963ef488d6018d04196753fe815ca (patch) | |
| tree | 09b198468fcc4b7a9405e68f355413aafde1d1b9 /indra/newview/llviewermenu.cpp | |
| parent | dff79705eddd4ce92fbb3d8a3b3b47a734b4837b (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index cd6601304d..0bec654455 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2754,6 +2754,7 @@ void handle_object_edit() if (gAgentCamera.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit()) { + LLFloaterTools::sPreviousFocusOnAvatar = true; LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); if (selection->getSelectType() == SELECT_TYPE_HUD || !gSavedSettings.getBOOL("EditCameraMovement")) |