OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-29 01:39:48 +01:00
parent 61e97ee4c8
commit 5ae8de3c00
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -4857,8 +4857,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
data.CollisionPlane.ToBytes(objectData, 0); data.CollisionPlane.ToBytes(objectData, 0);
data.OffsetPosition.ToBytes(objectData, 16); data.OffsetPosition.ToBytes(objectData, 16);
//data.Velocity.ToBytes(objectData, 28); // data.Velocity.ToBytes(objectData, 28);
//data.Acceleration.ToBytes(objectData, 40); // data.Acceleration.ToBytes(objectData, 40);
data.Rotation.ToBytes(objectData, 52); data.Rotation.ToBytes(objectData, 52);
//data.AngularVelocity.ToBytes(objectData, 64); //data.AngularVelocity.ToBytes(objectData, 64);

5
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -431,13 +431,10 @@ namespace OpenSim.Region.Physics.OdePlugin
value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5; value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
} }
_position.X = value.X;
_position.Y = value.Y;
_position.Z = value.Z;
m_taintPosition.X = value.X; m_taintPosition.X = value.X;
m_taintPosition.Y = value.Y; m_taintPosition.Y = value.Y;
m_taintPosition.Z = value.Z; m_taintPosition.Z = value.Z;
_parent_scene.AddPhysicsActorTaint(this); _parent_scene.AddPhysicsActorTaint(this);
} }
else else