aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolfocus.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lltoolfocus.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index 351c02b..ae0cd1e 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -216,10 +216,12 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info)
216 gAgent.setFocusGlobal(pick_info); 216 gAgent.setFocusGlobal(pick_info);
217 } 217 }
218 218
219 static BOOL* sFreezeTime = rebind_llcontrol<BOOL>("FreezeTime", &gSavedSettings, true);
220
219 if (!(pick_info.mKeyMask & MASK_ALT) && 221 if (!(pick_info.mKeyMask & MASK_ALT) &&
220 gAgent.cameraThirdPerson() && 222 gAgent.cameraThirdPerson() &&
221 gViewerWindow->getLeftMouseDown() && 223 gViewerWindow->getLeftMouseDown() &&
222 !gSavedSettings.getBOOL("FreezeTime") && 224 !(*sFreezeTime) &&
223 (hit_obj == gAgent.getAvatarObject() || 225 (hit_obj == gAgent.getAvatarObject() ||
224 (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf()))) 226 (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf())))
225 { 227 {