aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-29 01:39:48 +0100
committerJustin Clark-Casey (justincc)2011-10-29 01:39:48 +0100
commit5ae8de3c00cdf5d200b3158116a1e1fd9a404229 (patch)
treeeba76a426423e21c4c5a79770749ba2abec6bab2
parentRemove completely unused SOG.Rotation parameter (diff)
downloadopensim-SC_OLD-5ae8de3c00cdf5d200b3158116a1e1fd9a404229.zip
opensim-SC_OLD-5ae8de3c00cdf5d200b3158116a1e1fd9a404229.tar.gz
opensim-SC_OLD-5ae8de3c00cdf5d200b3158116a1e1fd9a404229.tar.bz2
opensim-SC_OLD-5ae8de3c00cdf5d200b3158116a1e1fd9a404229.tar.xz
Stop setting _position as well as m_taint_position in ODECharacter.Position
setting position at the same time as taint appears to undermine the whole purpose of taint testing doesn't reveal any obvious regressions in doing this
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs5
2 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 9f24ee7..a7f83f9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4857,8 +4857,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4857 4857
4858 data.CollisionPlane.ToBytes(objectData, 0); 4858 data.CollisionPlane.ToBytes(objectData, 0);
4859 data.OffsetPosition.ToBytes(objectData, 16); 4859 data.OffsetPosition.ToBytes(objectData, 16);
4860 //data.Velocity.ToBytes(objectData, 28); 4860// data.Velocity.ToBytes(objectData, 28);
4861 //data.Acceleration.ToBytes(objectData, 40); 4861// data.Acceleration.ToBytes(objectData, 40);
4862 data.Rotation.ToBytes(objectData, 52); 4862 data.Rotation.ToBytes(objectData, 52);
4863 //data.AngularVelocity.ToBytes(objectData, 64); 4863 //data.AngularVelocity.ToBytes(objectData, 64);
4864 4864
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index c22d27f..5ad7616 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -431,13 +431,10 @@ namespace OpenSim.Region.Physics.OdePlugin
431 value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5; 431 value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
432 } 432 }
433 433
434 _position.X = value.X;
435 _position.Y = value.Y;
436 _position.Z = value.Z;
437
438 m_taintPosition.X = value.X; 434 m_taintPosition.X = value.X;
439 m_taintPosition.Y = value.Y; 435 m_taintPosition.Y = value.Y;
440 m_taintPosition.Z = value.Z; 436 m_taintPosition.Z = value.Z;
437
441 _parent_scene.AddPhysicsActorTaint(this); 438 _parent_scene.AddPhysicsActorTaint(this);
442 } 439 }
443 else 440 else