diff options
| author | Melanie | 2013-04-10 13:20:55 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-10 13:20:55 +0100 |
| commit | 7cf377fff02de4504965420baaabd56b9a5379ee (patch) | |
| tree | 5dde9202c352446232e53af9ce85efad4735a572 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff) | |
| download | opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.zip opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.gz opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.bz2 opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 28fce53..a2510a78 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -5647,12 +5647,12 @@ Environment.Exit(1); | |||
| 5647 | List<SceneObjectGroup> objects, | 5647 | List<SceneObjectGroup> objects, |
| 5648 | out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ) | 5648 | out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ) |
| 5649 | { | 5649 | { |
| 5650 | minX = 256; | 5650 | minX = float.MaxValue; |
| 5651 | maxX = -256; | 5651 | maxX = float.MinValue; |
| 5652 | minY = 256; | 5652 | minY = float.MaxValue; |
| 5653 | maxY = -256; | 5653 | maxY = float.MinValue; |
| 5654 | minZ = 8192; | 5654 | minZ = float.MaxValue; |
| 5655 | maxZ = -256; | 5655 | maxZ = float.MinValue; |
| 5656 | 5656 | ||
| 5657 | List<Vector3> offsets = new List<Vector3>(); | 5657 | List<Vector3> offsets = new List<Vector3>(); |
| 5658 | 5658 | ||