diff options
author | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
commit | 31f3db02919870a8e92c9452de477c1478b273e9 (patch) | |
tree | 1acf6944bf8dbe0b67bb64caee9188ad5e36d913 /indra/newview/llagentcamera.cpp | |
parent | 0b996159cef3a4022c6a3d4691bd2e2db37b6e92 (diff) | |
parent | 9197a8652e49178c63ea208c6c4acf1ca3433659 (diff) |
merge changes for DRTVWR-417
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index aed27924fe..fa16f02c16 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -879,7 +879,7 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction) } LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); - if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD) + if (LLToolMgr::getInstance()->inBuildMode() && selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD) { // just update hud zoom level mHUDTargetZoom /= fraction; |