diff options
| author | Melanie | 2009-08-08 01:43:28 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-08 01:43:28 +0100 |
| commit | 0b0ed200f66bb8ab3c139d85263e7c8e81117791 (patch) | |
| tree | 49af5e09fa54c4ef1d441ebd58ab9c6bf4a242fd /OpenSim/Region/Physics/BulletDotNETPlugin | |
| parent | Change the default for internal IP address back to 0.0.0.0 (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.zip opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.gz opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.bz2 opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index 2cc5d41..7ab8b98 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
| @@ -2476,7 +2476,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 2476 | l_orientation.Z = tempOrientation2.getZ(); | 2476 | l_orientation.Z = tempOrientation2.getZ(); |
| 2477 | l_orientation.W = tempOrientation2.getW(); | 2477 | l_orientation.W = tempOrientation2.getW(); |
| 2478 | 2478 | ||
| 2479 | if (l_position.X > 255.95f || l_position.X < 0f || l_position.Y > 255.95f || l_position.Y < 0f) | 2479 | if (l_position.X > ((int)Constants.RegionSize - 0.05f) || l_position.X < 0f || l_position.Y > ((int)Constants.RegionSize - 0.05f) || l_position.Y < 0f) |
| 2480 | { | 2480 | { |
| 2481 | //base.RaiseOutOfBounds(l_position); | 2481 | //base.RaiseOutOfBounds(l_position); |
| 2482 | 2482 | ||