aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorBrian McBee2007-08-03 21:54:21 +0000
committerBrian McBee2007-08-03 21:54:21 +0000
commit6cb3833021a15e1f62ed198de8845b7332a2152b (patch)
tree2d8a8498f861a848f91e3082fa11aa9c22c8433b /OpenSim/Region/Environment/Scenes
parent* a very small first step with shape wrappers (diff)
downloadopensim-SC_OLD-6cb3833021a15e1f62ed198de8845b7332a2152b.zip
opensim-SC_OLD-6cb3833021a15e1f62ed198de8845b7332a2152b.tar.gz
opensim-SC_OLD-6cb3833021a15e1f62ed198de8845b7332a2152b.tar.bz2
opensim-SC_OLD-6cb3833021a15e1f62ed198de8845b7332a2152b.tar.xz
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs, OpenSim/Region/Environment/Scenes/ScenePresence.cs
Fix for array out-of-bounds error in basicphysics.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 7b97080..6c1e835 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes
550 LLVector3 pos2 = this.Pos; 550 LLVector3 pos2 = this.Pos;
551 LLVector3 vel = this.Velocity; 551 LLVector3 vel = this.Velocity;
552 552
553 float timeStep = 0.2f; 553 float timeStep = 0.1f;
554 pos2.X = pos2.X + (vel.X * timeStep); 554 pos2.X = pos2.X + (vel.X * timeStep);
555 pos2.Y = pos2.Y + (vel.Y * timeStep); 555 pos2.Y = pos2.Y + (vel.Y * timeStep);
556 pos2.Z = pos2.Z + (vel.Z * timeStep); 556 pos2.Z = pos2.Z + (vel.Z * timeStep);
@@ -576,25 +576,25 @@ namespace OpenSim.Region.Environment.Scenes
576 uint neighbourx = this.m_regionInfo.RegionLocX; 576 uint neighbourx = this.m_regionInfo.RegionLocX;
577 uint neighboury = this.m_regionInfo.RegionLocY; 577 uint neighboury = this.m_regionInfo.RegionLocY;
578 578
579 if (pos.X < 3) 579 if (pos.X < 1)
580 { 580 {
581 neighbourx -= 1; 581 neighbourx -= 1;
582 newpos.X = 254; 582 newpos.X = 255.9F;
583 } 583 }
584 if (pos.X > 252) 584 if (pos.X > 255)
585 { 585 {
586 neighbourx += 1; 586 neighbourx += 1;
587 newpos.X = 1; 587 newpos.X = 0.1F;
588 } 588 }
589 if (pos.Y < 3) 589 if (pos.Y < 1)
590 { 590 {
591 neighboury -= 1; 591 neighboury -= 1;
592 newpos.Y = 254; 592 newpos.Y = 255.9F;
593 } 593 }
594 if (pos.Y > 252) 594 if (pos.Y > 255)
595 { 595 {
596 neighboury += 1; 596 neighboury += 1;
597 newpos.Y = 1; 597 newpos.Y = 0.1F;
598 } 598 }
599 599
600 LLVector3 vel = this.m_velocity; 600 LLVector3 vel = this.m_velocity;