From 73599c0f25f67b6a2de61a36849bb8ce0b7b5279 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 6 Dec 2007 18:17:44 +0000
Subject: removed obsolete Verbose() function

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs        | 18 ++++++++----------
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs   |  2 +-
 .../Environment/Scenes/ScenePresence.Animations.cs     |  4 ++--
 OpenSim/Region/Environment/Scenes/ScenePresence.cs     |  3 +++
 4 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

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
 
         public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr)
         {
-
             m_parentScene = parent;
             m_regInfo = regInfo;
             PermissionsMngr = permissionsMngr;
             QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256);
             QuadTree.Subdivide();
             QuadTree.Subdivide();
-            
-
         }
+
         public PhysicsScene PhysicsScene
         {
             get
@@ -372,7 +370,6 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Other Methods
 
-
         public void physicsBasedCrash()
         {
             if (UnRecoverableError != null)
@@ -662,8 +659,6 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="prims"></param>    
         public void DelinkObjects(List<uint> primIds)
         {
-            //MainLog.Instance.Verbose("DelinkObjects()");
-
             SceneObjectGroup parenPrim = null;
 
             // Need a list of the SceneObjectGroup local ids
@@ -744,17 +739,20 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
         }
+
+        /// <summary>
+        /// Calculates the distance between two Vector3s
+        /// </summary>
+        /// <param name="v1"></param>
+        /// <param name="v2"></param>
+        /// <returns></returns>
         public float Vector3Distance(Vector3 v1, Vector3 v2)
         {
-            // Calculates the distance between two Vector3s
             // We don't really need the double floating point precision...   
             // so casting it to a single
 
             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));
-
         }
         #endregion
     }
 }
-
-
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
                 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
                 {
                     EntityBase selectedEnt = null;
-                    //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString());
+                    //MainLog.Instance.Verbose("CLIENT", "LocalID:" + Data.ObjectLocalID.ToString());
                     foreach (EntityBase ent in Entities.Values)
                     {
                         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
 
             public void LoadAnims()
             {
-                //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
+                //MainLog.Instance.Verbose("CLIENT", "Loading avatar animations");
                 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
                 {
                     XmlDocument doc = new XmlDocument();
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
 
-                // MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+                // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
 
                 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
                 {
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
             SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
             if (part != null)
             {
+                // TODO: determine position to sit at based on scene geometry; don't trust offset from client
+                // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
+
                 pos = part.AbsolutePosition + offset;
 
                 if (m_physicsActor != null)
-- 
cgit v1.1