From 551bfb88fce8a9cd6faac440e3d89d79213550ed Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 17 Dec 2010 07:29:27 -0500
Subject: [PATCH] Adjust parameter in call to setFocusOnAvatar to be more
efficient (don't animate)
---
doc/contributions.txt | 1 +
indra/newview/llagentcamera.cpp | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 67683204e29..7b4ccc2b919 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -359,6 +359,7 @@ Jonathan Yap
STORM-679
STORM-596
STORM-726
+ STORM-785
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 15f8e7bf4dd..f01d5ff1f53 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2695,6 +2695,9 @@ void LLAgentCamera::lookAtLastChat()
new_camera_pos -= delta_pos * 0.4f;
new_camera_pos += left * 0.3f;
new_camera_pos += up * 0.2f;
+
+ setFocusOnAvatar(FALSE, FALSE);
+
if (chatter_av->mHeadp)
{
setFocusGlobal(gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition()), gAgent.getLastChatter());
@@ -2705,7 +2708,6 @@ void LLAgentCamera::lookAtLastChat()
setFocusGlobal(chatter->getPositionGlobal(), gAgent.getLastChatter());
mCameraFocusOffsetTarget = gAgent.getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
}
- setFocusOnAvatar(FALSE, TRUE);
}
else
{
@@ -2725,9 +2727,10 @@ void LLAgentCamera::lookAtLastChat()
new_camera_pos += left * 0.3f;
new_camera_pos += up * 0.2f;
+ setFocusOnAvatar(FALSE, FALSE);
+
setFocusGlobal(chatter->getPositionGlobal(), gAgent.getLastChatter());
mCameraFocusOffsetTarget = gAgent.getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
- setFocusOnAvatar(FALSE, TRUE);
}
}
--
GitLab