From ef0e34a278c4c627ccb0393c9803e6ece79e7577 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 28 Dec 2012 16:40:08 +0100 Subject: [PATCH] Do not attach cam to avatar in Freeze Time mode. We do, and the avatar moves then the cam jumps away from the frozen avatar to where it really is. Unfortunately, it's still not possible to attach the cam to moving objects with this patch. Also, scripted changes to objects are still visible, like changes in local lights of texture full brightness. --- indra/newview/llagentcamera.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 8e940c4f5..8aac19016 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2523,9 +2523,10 @@ void LLAgentCamera::setFocusObject(LLViewerObject* object) //----------------------------------------------------------------------------- void LLAgentCamera::setFocusGlobal(const LLPickInfo& pick) { + static const LLCachedControl freeze_time("FreezeTime",false); LLViewerObject* objectp = gObjectList.findObject(pick.mObjectID); - if (objectp) + if (objectp && !freeze_time) { // focus on object plus designated offset // which may or may not be same as pick.mPosGlobal