diff options
| author | callum_linden <none@none> | 2015-08-31 11:17:28 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-08-31 11:17:28 -0700 |
| commit | 1db2c7276d0bb1039ad8be9240201732ad5387cd (patch) | |
| tree | a2bc6f6f80772cc459f23a075ba3bc0b75b5de48 /indra/newview/llviewermenu.cpp | |
| parent | 0ad81961cd5aea97231959fd31daa22dd2d8908a (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge with viewer-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 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")) |