diff options
author | Melanie | 2010-08-26 23:39:20 +0100 |
---|---|---|
committer | Melanie | 2010-08-26 23:39:20 +0100 |
commit | 1f1d72eba5ca2b1e4115e93af1ed88950dce585a (patch) | |
tree | 2dfcb626f9eb5fc6244b9fe7dac4b46a9c587703 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Send a null result search packet when no results are passsed in (diff) | |
parent | More on mantis #4985 (diff) | |
download | opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.zip opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.tar.gz opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.tar.bz2 opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 08c6e27..fbb3177 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2326,15 +2326,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2326 | { | 2326 | { |
2327 | m_perfMonMS = Util.EnvironmentTickCount(); | 2327 | m_perfMonMS = Util.EnvironmentTickCount(); |
2328 | 2328 | ||
2329 | PhysicsActor actor = m_physicsActor; | ||
2330 | Vector3 velocity = (actor != null) ? actor.Velocity : Vector3.Zero; | ||
2331 | |||
2332 | Vector3 pos = m_pos; | 2329 | Vector3 pos = m_pos; |
2333 | pos.Z += m_appearance.HipOffset; | 2330 | pos.Z += m_appearance.HipOffset; |
2334 | 2331 | ||
2335 | //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); | 2332 | //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); |
2336 | 2333 | ||
2337 | remoteClient.SendPrimUpdate(this, PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); | 2334 | remoteClient.SendPrimUpdate( |
2335 | this, | ||
2336 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | ||
2337 | | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); | ||
2338 | 2338 | ||
2339 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2339 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2340 | m_scene.StatsReporter.AddAgentUpdates(1); | 2340 | m_scene.StatsReporter.AddAgentUpdates(1); |