keeping opensim safe for children -- made some namespace references less explicit

9 files changed, 17 insertions, 39 deletions

diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 924972b..be38baf 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -259,7 +259,6 @@ namespace OpenSim.Region.Environment.Modules
                     }
                 }
             }
-
         }
     }
 
@@ -306,7 +305,7 @@ namespace OpenSim.Region.Environment.Modules
             }
             catch (Exception)
             {
-                OpenSim.Framework.Console.MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration");
+                MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration");
             }
             m_log = MainLog.Instance;
         }
@@ -442,7 +441,6 @@ namespace OpenSim.Region.Environment.Modules
             }
         }
 
-
         public void Close()
         {
             listener.Abort();
@@ -452,4 +450,4 @@ namespace OpenSim.Region.Environment.Modules
             m_tcp.Close();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 290629c..2511baf 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -662,7 +662,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="prims"></param>    
         public void DelinkObjects(List<uint> primIds)
         {
-            //OpenSim.Framework.Console.MainLog.Instance.Verbose("DelinkObjects()");
+            //MainLog.Instance.Verbose("DelinkObjects()");
 
             SceneObjectGroup parenPrim = null;
 
@@ -700,7 +700,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
             else
             {
-                OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", 
+                MainLog.Instance.Verbose("SCENE", 
                     "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
                     primIds);
             }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5976fdc..f518d63 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
                         }
                         else
                         {
-                            OpenSim.Framework.Console.MainLog.Instance.Warn(
+                            MainLog.Instance.Warn(
                                 "Asset ID " + item.assetID + " not found for item ID " + itemID
                                 + " named " + item.inventoryName + " for an inventory item update.");
                             return;
@@ -199,13 +199,13 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else
                 { 
-                    OpenSim.Framework.Console.MainLog.Instance.Warn(
+                    MainLog.Instance.Warn(
                         "Item ID " + itemID + " not found for an inventory item update.");                    
                 }
             }
             else
             {
-                OpenSim.Framework.Console.MainLog.Instance.Warn(
+                MainLog.Instance.Warn(
                     "Agent ID " + remoteClient.AgentId + " not found for an inventory item update."); 
             }
         }
@@ -439,7 +439,7 @@ namespace OpenSim.Region.Environment.Scenes
                 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
                 {
                     EntityBase selectedEnt = null;
-                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
+                    //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString());
                     foreach (EntityBase ent in Entities.Values)
                     {
                         if (ent.LocalId == Data.ObjectLocalID)
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 0923010..04228de 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -7,7 +7,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
 
-
 namespace OpenSim.Region.Environment.Scenes
 {
     public delegate void KillObjectDelegate(uint localID);
@@ -28,16 +27,12 @@ namespace OpenSim.Region.Environment.Scenes
         public KillObjectDelegate KillObject;
         public string _debugRegionName = "";
 
-
         public string debugRegionName
         {
             get { return _debugRegionName; }
             set
             {
                 _debugRegionName = value;
-
-
-
             }
         }
 
@@ -64,13 +59,10 @@ namespace OpenSim.Region.Environment.Scenes
                 regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing;
                 regionCommsHost.OnCloseAgentConnection += CloseConnection;
                 regionCommsHost.OnRegionUp += newRegionUp;
-
-
             }
             else
             {
                 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
-
             }
         }
 
@@ -360,8 +352,6 @@ namespace OpenSim.Region.Environment.Scenes
             return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
         }
 
-
-
         public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical)
         {
             return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical);
@@ -371,11 +361,9 @@ namespace OpenSim.Region.Environment.Scenes
         {
             foreach (ulong regionHandle in presence.KnownChildRegions)
             {
-
                 m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId);
                 presence.RemoveNeighbourRegion(regionHandle);
             }
         }
     }
 }
-
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 347091f..2af9af2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -95,7 +95,6 @@ namespace OpenSim.Region.Environment.Scenes
         {
             scene.OnRestart += HandleRestart;
             m_localScenes.Add(scene);
-
         }
 
         public void HandleRestart(RegionInfo rdata)
@@ -155,6 +154,7 @@ namespace OpenSim.Region.Environment.Scenes
                 MainLog.Instance.Error("REGION", "Unable to notify Other regions of this Region coming up");
             }
         }
+
         public void SaveCurrentSceneToXml(string filename)
         {
             CurrentOrFirstScene.SavePrimsToXml(filename);
@@ -291,7 +291,6 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-
         public void SetDebugPacketOnCurrentScene(LogBase log, int newDebug)
         {
             ForEachCurrentScene(delegate(Scene scene)
@@ -360,7 +359,6 @@ namespace OpenSim.Region.Environment.Scenes
                                     });
         }
 
-
         public void ForceCurrentSceneClientUpdate()
         {
             ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); });
@@ -401,7 +399,6 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-
         public void CloseScene(Scene scene)
         {
             m_localScenes.Remove(scene);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index e82c38c..fe135de 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -35,6 +35,7 @@ using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Physics.Manager;
 using System.Drawing;
@@ -951,7 +952,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
             else
             {
-                OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE",
+                MainLog.Instance.Verbose("SCENE",
                     "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
                     partID, LocalId);
             }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a60e3b5..12d5bdb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -34,6 +34,7 @@ using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
@@ -1392,15 +1393,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void PhysicsOutOfBounds(PhysicsVector pos)
         {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds.");
+            MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds.");
             RemFlag(LLObject.ObjectFlags.Physics);
             DoPhysicsPropertyUpdate(false, true);
             m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
-
-
         }
 
-
         public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient)
         {
         }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 5de816f..c1e4805 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()
             {
-                //OpenSim.Framework.Console.MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
+                //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
                 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
                 {
                     XmlDocument doc = new XmlDocument();
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
 
-                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+                // MainLog.Instance.Verbose("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 abfa250..524fb60 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -36,7 +36,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Environment.Types;
 using OpenSim.Region.Physics.Manager;
 
-
 namespace OpenSim.Region.Environment.Scenes
 {
     public partial class ScenePresence : EntityBase
@@ -512,7 +511,7 @@ namespace OpenSim.Region.Environment.Scenes
             for (int i = 0; i < visualParam.Length; i++)
             {
                 m_visualParams[i] = visualParam[i].ParamValue;
-                //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "VisualData[" + i.ToString() + "]: " + visualParam[i].ParamValue.ToString() + "m");  
+                //MainLog.Instance.Verbose("CLIENT", "VisualData[" + i.ToString() + "]: " + visualParam[i].ParamValue.ToString() + "m");  
             }
             
             // Teravus : Nifty AV Height Getting Maaaaagical formula.  Oh how we love turning 0-255 into meters.
@@ -525,7 +524,7 @@ namespace OpenSim.Region.Environment.Scenes
                 PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight);
                 PhysicsActor.Size = SetSize;
             }
-            //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m");
+            //MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m");
             SendAppearanceToAllOtherAgents();
         }
 
@@ -675,7 +674,6 @@ namespace OpenSim.Region.Environment.Scenes
                     UpdateMovementAnimations(update_movementflag);
                 }
             }
-            
         }
 
         /// <summary>
@@ -781,7 +779,6 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 PhysicsActor.SetAlwaysRun = SetAlwaysRun;
             }
-
         }
 
         protected void UpdateMovementAnimations(bool update_movementflag)
@@ -1020,7 +1017,6 @@ namespace OpenSim.Region.Environment.Scenes
             m_newCoarseLocations = true;
         }
 
-
         /// <summary>
         /// 
         /// </summary>