diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
| commit | 96bb17f20bbcdc595f3a615a3129e134595b3a4a (patch) | |
| tree | e51e47f79b78a076e821360763196cc72c154aad /indra/newview/llviewermenu.cpp | |
| parent | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (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")) |