aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs18
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
4 files changed, 14 insertions, 13 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
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index d8abe90..dbcd332 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Environment.Scenes
411 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) 411 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
412 { 412 {
413 EntityBase selectedEnt = null; 413 EntityBase selectedEnt = null;
414 //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString()); 414 //MainLog.Instance.Verbose("CLIENT", "LocalID:" + Data.ObjectLocalID.ToString());
415 foreach (EntityBase ent in Entities.Values) 415 foreach (EntityBase ent in Entities.Values)
416 { 416 {
417 if (ent.LocalId == Data.ObjectLocalID) 417 if (ent.LocalId == Data.ObjectLocalID)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index c1e4805..484b9f1 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
44 44
45 public void LoadAnims() 45 public void LoadAnims()
46 { 46 {
47 //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations"); 47 //MainLog.Instance.Verbose("CLIENT", "Loading avatar animations");
48 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) 48 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
49 { 49 {
50 XmlDocument doc = new XmlDocument(); 50 XmlDocument doc = new XmlDocument();
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
58 } 58 }
59 } 59 }
60 60
61 // MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 61 // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
62 62
63 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID) 63 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
64 { 64 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2f00515..83d3306 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -711,6 +711,9 @@ namespace OpenSim.Region.Environment.Scenes
711 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 711 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
712 if (part != null) 712 if (part != null)
713 { 713 {
714 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
715 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
716
714 pos = part.AbsolutePosition + offset; 717 pos = part.AbsolutePosition + offset;
715 718
716 if (m_physicsActor != null) 719 if (m_physicsActor != null)