summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-05-31 15:23:02 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-05-31 15:23:02 -0600
commitf6c5a4057d1154e590ee630cb8254879a1f426e4 (patch)
tree8e858cad43f2e96329b009d47f867d7281566a3d /indra/newview
parente50e6004082223fdc0bfd78bc697d48a7f45b379 (diff)
parenta6e80e3526af3890e688e53329be040e899fe203 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermessage.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8dc72ba5b4..4b1c9c5574 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4222,9 +4222,6 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
LLQuaternion head_rotation = gAgent.getHeadRotation();
camera_pos_agent = gAgentCamera.getCameraPositionAgent();
- LLVector3 camera_velocity = LLViewerCamera::getInstance()->getVelocityDir() * LLViewerCamera::getInstance()->getAverageSpeed();
- F32 time_delta = 1.0f; //predict the camera position in 1 second
- camera_pos_agent += camera_velocity * time_delta;
render_state = gAgent.getRenderState();