summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-21 11:00:22 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-21 11:00:22 -0400
commit2afde26d93cc8773f5e84d187844f909347fc1bf (patch)
tree5857549829b90f047ae094ebd9b6a9d2817d59aa /indra/newview/llagentcamera.cpp
parent132a2587dff85006636d8092ae1b34081f12fe69 (diff)
parent4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff)
merge
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rwxr-xr-xindra/newview/llagentcamera.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index d22c88a8a0..e335eabd1a 100755
--- 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;