diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 4c168b3..04bdf5a 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -37,16 +37,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
37 | 37 | ||
38 | public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr) | 38 | public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr) |
39 | { | 39 | { |
40 | |||
41 | m_parentScene = parent; | 40 | m_parentScene = parent; |
42 | m_regInfo = regInfo; | 41 | m_regInfo = regInfo; |
43 | PermissionsMngr = permissionsMngr; | 42 | PermissionsMngr = permissionsMngr; |
44 | QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256); | 43 | QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256); |
45 | QuadTree.Subdivide(); | 44 | QuadTree.Subdivide(); |
46 | QuadTree.Subdivide(); | 45 | QuadTree.Subdivide(); |
47 | |||
48 | |||
49 | } | 46 | } |
47 | |||
50 | public PhysicsScene PhysicsScene | 48 | public PhysicsScene PhysicsScene |
51 | { | 49 | { |
52 | get | 50 | get |
@@ -372,7 +370,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
372 | 370 | ||
373 | #region Other Methods | 371 | #region Other Methods |
374 | 372 | ||
375 | |||
376 | public void physicsBasedCrash() | 373 | public void physicsBasedCrash() |
377 | { | 374 | { |
378 | if (UnRecoverableError != null) | 375 | if (UnRecoverableError != null) |
@@ -662,8 +659,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
662 | /// <param name="prims"></param> | 659 | /// <param name="prims"></param> |
663 | public void DelinkObjects(List<uint> primIds) | 660 | public void DelinkObjects(List<uint> primIds) |
664 | { | 661 | { |
665 | //MainLog.Instance.Verbose("DelinkObjects()"); | ||
666 | |||
667 | SceneObjectGroup parenPrim = null; | 662 | SceneObjectGroup parenPrim = null; |
668 | 663 | ||
669 | // Need a list of the SceneObjectGroup local ids | 664 | // Need a list of the SceneObjectGroup local ids |
@@ -744,17 +739,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
744 | } | 739 | } |
745 | 740 | ||
746 | } | 741 | } |
742 | |||
743 | /// <summary> | ||
744 | /// Calculates the distance between two Vector3s | ||
745 | /// </summary> | ||
746 | /// <param name="v1"></param> | ||
747 | /// <param name="v2"></param> | ||
748 | /// <returns></returns> | ||
747 | public float Vector3Distance(Vector3 v1, Vector3 v2) | 749 | public float Vector3Distance(Vector3 v1, Vector3 v2) |
748 | { | 750 | { |
749 | // Calculates the distance between two Vector3s | ||
750 | // We don't really need the double floating point precision... | 751 | // We don't really need the double floating point precision... |
751 | // so casting it to a single | 752 | // so casting it to a single |
752 | 753 | ||
753 | return (float)Math.Sqrt((v1.x - v2.x) * (v1.x - v2.x) + (v1.y - v2.y) * (v1.y - v2.y) + (v1.z - v2.z) * (v1.z - v2.z)); | 754 | return (float)Math.Sqrt((v1.x - v2.x) * (v1.x - v2.x) + (v1.y - v2.y) * (v1.y - v2.y) + (v1.z - v2.z) * (v1.z - v2.z)); |
754 | |||
755 | } | 755 | } |
756 | #endregion | 756 | #endregion |
757 | } | 757 | } |
758 | } | 758 | } |
759 | |||
760 | |||