aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs20
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index b40a98f..d155f05 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -599,7 +599,9 @@ namespace OpenSim.Region.Physics.OdePlugin
599 public IntPtr calculateSpaceForGeom(PhysicsVector pos) 599 public IntPtr calculateSpaceForGeom(PhysicsVector pos)
600 { 600 {
601 int[] xyspace = calculateSpaceArrayItemFromPos(pos); 601 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
602 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
602 IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]]; 603 IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]];
604
603 //locationbasedspace = space; 605 //locationbasedspace = space;
604 return locationbasedspace; 606 return locationbasedspace;
605 } 607 }
@@ -1439,6 +1441,24 @@ namespace OpenSim.Region.Physics.OdePlugin
1439 1441
1440 _velocity = new PhysicsVector(); 1442 _velocity = new PhysicsVector();
1441 _position = pos; 1443 _position = pos;
1444
1445 //if (_position.X > 257)
1446 //{
1447 // _position.X = 257;
1448 //}
1449 //if (_position.X < 0)
1450 //{
1451 // _position.X = 0;
1452 //}
1453 //if (_position.Y > 257)
1454 //{
1455 // _position.Y = 257;
1456 // }
1457 //if (_position.Y < 0)
1458 //{
1459 // _position.Y = 0;
1460 //}
1461
1442 _size = size; 1462 _size = size;
1443 _acceleration = new PhysicsVector(); 1463 _acceleration = new PhysicsVector();
1444 m_rotationalVelocity = PhysicsVector.Zero; 1464 m_rotationalVelocity = PhysicsVector.Zero;