removed obsolete Verbose() function

8 files changed, 57 insertions, 38 deletions

diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index adbc625..0e66330 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -1,4 +1,32 @@
-using System;
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Mono.Addins;
@@ -14,4 +42,3 @@ namespace OpenSim
         void Close();
     }
 }
-
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d6dc3ea..64fe8df 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -449,7 +449,7 @@ namespace OpenSim
 
         public void handleRestartRegion(RegionInfo whichRegion) 
         {
-            MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager");
+            MainLog.Instance.Error("MAIN", "Got restart signal from SceneManager");
             // Shutting down the UDP server
             bool foundUDPServer = false;
             int UDPServerElement = 0;
@@ -543,7 +543,7 @@ namespace OpenSim
             m_log.Verbose("SHUTDOWN", "Closing all threads");
             m_log.Verbose("SHUTDOWN", "Killing listener thread");
             m_log.Verbose("SHUTDOWN", "Killing clients");
-            // IMPLEMENT THIS
+            // TODO: implement this
             m_log.Verbose("SHUTDOWN", "Closing console and terminating");
 
             m_sceneManager.Close();
@@ -789,10 +789,7 @@ namespace OpenSim
                     {
                         string regionName = CombineParams(cmdparams, 0);
 
-                        if (m_sceneManager.TrySetCurrentScene(regionName))
-                        {
-                        }
-                        else
+                        if (!m_sceneManager.TrySetCurrentScene(regionName))
                         {
                             MainLog.Instance.Error("Couldn't set current region to: " + regionName);
                         }
@@ -812,16 +809,14 @@ namespace OpenSim
                     break;
 
                 case "export-map":
-                   
-                        if (cmdparams.Length > 0)
-                        {
-                            m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
-                        }
-                        else
-                        {
-                            m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
-                        }
-                   
+                    if (cmdparams.Length > 0)
+                    {
+                        m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
+                    }
+                    else
+                    {
+                        m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
+                    }
                     break;
 
                 default:
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 415b04e..fb1623b 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2546,7 +2546,7 @@ namespace OpenSim.Region.ClientStack
                         return;
                     }
 
-                    //MainLog.Instance.Verbose("Sending PacketAck");
+                    //MainLog.Instance.Verbose("NETWORK", "Sending PacketAck");
 
                     int i = 0;
                     PacketAckPacket acks = new PacketAckPacket();
@@ -2701,7 +2701,6 @@ namespace OpenSim.Region.ClientStack
                         }
                         break;
                     case PacketType.AgentSetAppearance:
-                        //MainLog.Instance.Verbose("set appear", Pack.ToString());
                         AgentSetAppearancePacket appear = (AgentSetAppearancePacket) Pack;
                         if (OnSetAppearance != null)
                         {
@@ -2785,7 +2784,6 @@ namespace OpenSim.Region.ClientStack
                         #region Objects/m_sceneObjects
 
                     case PacketType.ObjectLink:
-                        //MainLog.Instance.Verbose(Pack.ToString());
                         ObjectLinkPacket link = (ObjectLinkPacket) Pack;
                         uint parentprimid = 0;
                         List<uint> childrenprims = new List<uint>();
@@ -2804,7 +2802,6 @@ namespace OpenSim.Region.ClientStack
                         }
                         break;
                     case PacketType.ObjectDelink:
-                        //MainLog.Instance.Verbose(Pack.ToString());
                         ObjectDelinkPacket delink = (ObjectDelinkPacket) Pack;
                         
                         // It appears the prim at index 0 is not always the root prim (for
@@ -3677,8 +3674,7 @@ namespace OpenSim.Region.ClientStack
                         MainLog.Instance.Debug("CLIENT", "possibly unhandled StartPingCheck packet");
                         break;
                     case PacketType.CompletePingCheck:
-                        // Parhaps this should be processed on the Sim to determine whether or not to drop a dead client
-                        // Dumping it to the verbose console until it's handled properly.
+                        // TODO: Perhaps this should be processed on the Sim to determine whether or not to drop a dead client
                         MainLog.Instance.Warn("CLIENT", "unhandled CompletePingCheck packet");
                         break;
                     case PacketType.ObjectScale:
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)
diff --git a/OpenSim/Region/ExtensionsScriptModule/Script.cs b/OpenSim/Region/ExtensionsScriptModule/Script.cs
index 350ca2d..4493741 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Script.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Script.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
 
         private void events_OnFrame()
         {
-            //script.logger.Verbose("Hello World!");
+            //script.logger.Verbose("TESTSCRIPT", "Hello World!");
         }
     }
 }
\ No newline at end of file