diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 8fdc5a7..00163f6 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -311,6 +311,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
311 | 311 | ||
312 | private volatile int m_global_contactcount = 0; | 312 | private volatile int m_global_contactcount = 0; |
313 | 313 | ||
314 | private Vector3 m_worldOffset = Vector3.Zero; | ||
315 | private Vector2 m_worldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize); | ||
316 | |||
314 | private ODERayCastRequestManager m_rayCastManager; | 317 | private ODERayCastRequestManager m_rayCastManager; |
315 | 318 | ||
316 | /// <summary> | 319 | /// <summary> |
@@ -1651,6 +1654,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1651 | private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation, | 1654 | private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation, |
1652 | IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) | 1655 | IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) |
1653 | { | 1656 | { |
1657 | |||
1654 | PhysicsVector pos = new PhysicsVector(position.X, position.Y, position.Z); | 1658 | PhysicsVector pos = new PhysicsVector(position.X, position.Y, position.Z); |
1655 | //pos.X = position.X; | 1659 | //pos.X = position.X; |
1656 | //pos.Y = position.Y; | 1660 | //pos.Y = position.Y; |
@@ -2553,6 +2557,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2553 | if (framecount >= int.MaxValue) | 2557 | if (framecount >= int.MaxValue) |
2554 | framecount = 0; | 2558 | framecount = 0; |
2555 | 2559 | ||
2560 | if (m_worldOffset != Vector3.Zero) | ||
2561 | return 0; | ||
2562 | |||
2556 | framecount++; | 2563 | framecount++; |
2557 | 2564 | ||
2558 | float fps = 0; | 2565 | float fps = 0; |
@@ -3375,6 +3382,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3375 | return waterlevel; | 3382 | return waterlevel; |
3376 | } | 3383 | } |
3377 | 3384 | ||
3385 | |||
3386 | |||
3378 | public override void SetWaterLevel(float baseheight) | 3387 | public override void SetWaterLevel(float baseheight) |
3379 | { | 3388 | { |
3380 | waterlevel = baseheight; | 3389 | waterlevel = baseheight; |