diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-17 20:06:49 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-17 20:06:49 -0400 |
| commit | 3d7ae2b2f289ea0cbb8f430d1674782dc18af403 (patch) | |
| tree | 61924416fe7e6fdbc74790ea52299d5fbb3315f2 /indra/newview/llviewermenu.cpp | |
| parent | 2a57da233423ca3531bfcec2e138023afead4c3f (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge
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 67f8581b9d..2505ae6a9c 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2757,6 +2757,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")) |