21 files changed, 111 insertions, 168 deletions

diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index c2c1ecf..b5a74ad 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -28,13 +28,12 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Region.Environment;

-using OpenSim.Region.Environment.Scenes;

-using OpenSim;

 using libsecondlife;

 using libsecondlife.Packets;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+using OpenSim.Region.Environment.Scenes;

 using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;

 

 

@@ -79,30 +78,30 @@ namespace OpenSim.Region.Environment
                     case "setregioninfo":

                         if (packet.ParamList.Length != 9)

                         {

-                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");

+                            MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");

                         }

                         else

                         {

-                            m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;

+                            m_regInfo.estateSettings.regionFlags = Simulator.RegionFlags.None;

 

                             if (convertParamStringToBool(packet.ParamList[0].Parameter))

                             {

-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;

+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockTerraform;

                             }

 

                             if (convertParamStringToBool(packet.ParamList[1].Parameter))

                             {

-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;

+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.NoFly;

                             }

 

                             if (convertParamStringToBool(packet.ParamList[2].Parameter))

                             {

-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;

+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowDamage;

                             }

 

                             if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)

                             {

-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;

+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockLandResell;

                             }

 

 

@@ -113,17 +112,17 @@ namespace OpenSim.Region.Environment
                             m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;

 

                             int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));

-                            m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;

+                            m_regInfo.estateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel;

                             

 

                             if (convertParamStringToBool(packet.ParamList[7].Parameter))

                             {

-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;

+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.RestrictPushObject;

                             }

 

                             if (convertParamStringToBool(packet.ParamList[8].Parameter))

                             {

-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;

+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowParcelChanges;

                             }

 

                             sendRegionInfoPacketToAll();

@@ -223,7 +222,7 @@ namespace OpenSim.Region.Environment
                     case "setregionterrain":

                         if (packet.ParamList.Length != 9)

                         {

-                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");

+                            MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");

                         }

                         else

                         {

@@ -237,7 +236,7 @@ namespace OpenSim.Region.Environment
                         }

                         break;

                     default:

-                        OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());

+                        MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());

                         break;

                 }

             }

@@ -265,7 +264,7 @@ namespace OpenSim.Region.Environment
 

         public void sendRegionInfoPacket(IClientAPI remote_client)

         {

-            Encoding _enc = System.Text.Encoding.ASCII;

+            Encoding _enc = Encoding.ASCII;

 

             AgentCircuitData circuitData = remote_client.RequestClientInfo();

 

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 3afbe6e..2059b3f 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -27,7 +27,6 @@
 */

 using System;

 using System.Collections.Generic;

-using System.Text;

 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

@@ -43,7 +42,7 @@ namespace OpenSim.Region.Environment
     /// <summary>

     /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)

     /// </summary>

-    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver

+    public class ParcelManager : ILocalStorageParcelReceiver

     {

 

         #region Constants

@@ -420,7 +419,7 @@ namespace OpenSim.Region.Environment
             {

                 for (y = 0; y < inc_y; y++)

                 {

-                    OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);

+                    Parcel currentParcel = getParcel(start_x + x, start_y + y);

                     if (!temp.Contains(currentParcel))

                     {

                         currentParcel.forceUpdateParcelInfo();

@@ -429,10 +428,10 @@ namespace OpenSim.Region.Environment
                 }

             }

 

-            int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;

+            int requestResult = PARCEL_RESULT_ONE_PARCEL;

             if (temp.Count > 1)

             {

-                requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;

+                requestResult = PARCEL_RESULT_MULTIPLE_PARCELS;

             }

 

             for (i = 0; i < temp.Count; i++)

@@ -571,7 +570,7 @@ namespace OpenSim.Region.Environment
 

             updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;

 

-            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);

+            updatePacket.ParcelData.Desc = Helpers.StringToField(parcelData.parcelDesc);

             updatePacket.ParcelData.Category = (byte)parcelData.category;

             updatePacket.ParcelData.ClaimDate = parcelData.claimDate;

             updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;

@@ -631,7 +630,7 @@ namespace OpenSim.Region.Environment
                 parcelData.mediaID = packet.ParcelData.MediaID;

                 parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);

                 parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);

-                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);

+                parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name);

                 parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;

                 parcelData.passHours = packet.ParcelData.PassHours;

                 parcelData.passPrice = packet.ParcelData.PassPrice;

diff --git a/OpenSim/Region/Environment/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
index 4ff55a8..cd67e97 100644
--- a/OpenSim/Region/Environment/RegionManager.cs
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -1,11 +1,9 @@
-using System;

 using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Communications;

 using OpenSim.Framework;

-using OpenSim.Framework.Types;

+using OpenSim.Framework.Communications;

 using OpenSim.Framework.Servers;

 using OpenSim.Region.Capabilities;

+using OpenSim.Region.Environment.Scenes;

 

 namespace OpenSim.Region.Environment

 {

@@ -17,7 +15,7 @@ namespace OpenSim.Region.Environment
         protected List<Caps> capsHandlers = new List<Caps>();

         protected BaseHttpServer httpListener;

 

-        protected Scenes.Scene m_Scene;

+        protected Scene m_Scene;

 

         public ParcelManager parcelManager;

         public EstateManager estateManager;

diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index 6db57a4..c697faa 100644
--- a/OpenSim/Region/Environment/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -26,11 +26,8 @@
 * 

 */

 using System;

-using System.Collections.Generic;

-using System.Text;

-using Axiom.MathLib;

-using OpenSim.Physics.Manager;

 using libsecondlife;

+using OpenSim.Physics.Manager;

 

 namespace OpenSim.Region.Environment.Scenes

 {

diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 63f3f5d..a8eb9ce 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -1,6 +1,4 @@
-using System;

 using System.Collections.Generic;

-using System.Text;

 using Axiom.MathLib;

 using libsecondlife;

 

@@ -8,7 +6,7 @@ namespace OpenSim.Region.Environment.Scenes
 {

     public abstract class EntityBase

     {

-        public libsecondlife.LLUUID uuid;

+        public LLUUID uuid;

        

         protected List<EntityBase> children;

 

@@ -83,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>

         public EntityBase()

         {

-            uuid = new libsecondlife.LLUUID();

+            uuid = new LLUUID();

 

             m_pos = new LLVector3();

             velocity = new LLVector3();

diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 36023d0..7c3a033 100644
--- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -1,11 +1,6 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

 using libsecondlife;

 using libsecondlife.Packets;

-using OpenSim.Physics.Manager;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Environment.Scenes

 {

diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index b8ec68b..a767bd2 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -1,12 +1,11 @@
 using System;

 using System.Collections.Generic;

-using System.Text;

+using Axiom.MathLib;

 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Physics.Manager;

-using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -266,7 +265,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void SendTerseUpdateToClient(IClientAPI RemoteClient)

         {

             LLVector3 lPos;

-            Axiom.MathLib.Quaternion lRot;

+            Quaternion lRot;

 

             lPos = this.Pos;

             lRot = this.rotation;

diff --git a/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs b/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
index d703857..4213a18 100644
--- a/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
+++ b/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
@@ -29,12 +29,13 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using Axiom.MathLib;

 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Physics.Manager;

-using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Types;

+using OpenSim.Physics.Manager;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -174,9 +175,9 @@ namespace OpenSim.Region.Environment.Scenes
             dataArrays.Add(primData.ToBytes());

             foreach (Entity child in children)

             {

-                if (child is OpenSim.Region.Environment.Scenes.PrimitiveOld)

+                if (child is PrimitiveOld)

                 {

-                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.PrimitiveOld)child).GetByteArray());

+                    dataArrays.Add(((PrimitiveOld)child).GetByteArray());

                 }

             }

             byte[] primstart = Helpers.StringToField("<Prim>");

@@ -351,7 +352,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <returns></returns>

         public byte[] ConvertInventoryToBytes()

         {

-            System.Text.Encoding enc = System.Text.Encoding.ASCII;

+            Encoding enc = Encoding.ASCII;

             byte[] result = new byte[0];

             List<byte[]> inventoryData = new List<byte[]>();

             int totallength = 0;

@@ -434,7 +435,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void SendTerseUpdateToClient(IClientAPI RemoteClient)

         {

             LLVector3 lPos;

-            Axiom.MathLib.Quaternion lRot;

+            Quaternion lRot;

             if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?

             {

                 PhysicsVector pPos = this._physActor.Position;

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index d8533b0..669039f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -27,14 +27,10 @@
 */

 using System;

 using System.Collections.Generic;

-using System.Text;

 using libsecondlife;

 using libsecondlife.Packets;

-using OpenSim.Physics.Manager;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Utilities;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -253,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {

                     if (((SceneObject)ent).rootLocalID == primLocalID)

                     {

-                      ((OpenSim.Region.Environment.Scenes.SceneObject)ent).GetProperites(remoteClient);

+                      ((SceneObject)ent).GetProperites(remoteClient);

                         break;

                     }

                 }

@@ -349,7 +345,7 @@ namespace OpenSim.Region.Environment.Scenes
             {

                 if (ent.LocalId == localID)

                 {

-                    ((OpenSim.Region.Environment.Scenes.PrimitiveOld)ent).UpdatePosition(pos);

+                    ((PrimitiveOld)ent).UpdatePosition(pos);

                     break;

                 }

             }

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 059bfd7..2bc3f8c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -26,27 +26,23 @@
 * 

 */

 using System;

-using libsecondlife;

-using libsecondlife.Packets;

 using System.Collections.Generic;

-using System.Text;

-using System.Reflection;

-using System.IO;

 using System.Threading;

 using System.Timers;

-using OpenSim.Physics.Manager;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Inventory;

+using libsecondlife;

+using libsecondlife.Packets;

 using OpenSim.Framework;

-using OpenSim.Region.Terrain;

 using OpenSim.Framework.Communications;

-using OpenSim.Region.Caches;

-using OpenSim.Region.Environment;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Servers;

+using OpenSim.Framework.Types;

+using OpenSim.Physics.Manager;

+using OpenSim.Region.Caches;

 using OpenSim.Region.Enviorment.Scripting;

-using OpenSim.Region.Capabilities;

-using Caps = OpenSim.Region.Capabilities.Caps;

+using OpenSim.Region.Terrain;

+using Caps=OpenSim.Region.Capabilities.Caps;

+using Timer=System.Timers.Timer;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -54,9 +50,9 @@ namespace OpenSim.Region.Environment.Scenes
 

     public partial class Scene : SceneBase, ILocalStorageReceiver

     {

-        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();

-        protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;

-        protected Dictionary<libsecondlife.LLUUID, SceneObject> Prims;

+        protected Timer m_heartbeatTimer = new Timer();

+        protected Dictionary<LLUUID, ScenePresence> Avatars;

+        protected Dictionary<LLUUID, SceneObject> Prims;

         private PhysicsScene phyScene;

         private float timeStep = 0.1f;

         private Random Rand = new Random();

@@ -119,12 +115,12 @@ namespace OpenSim.Region.Environment.Scenes
             scriptManager = new ScriptManager(this);

             eventManager = new EventManager();

 

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs - creating new entitities instance");

-            Entities = new Dictionary<libsecondlife.LLUUID, EntityBase>();

+            MainLog.Instance.Verbose("World.cs - creating new entitities instance");

+            Entities = new Dictionary<LLUUID, EntityBase>();

             Avatars = new Dictionary<LLUUID, ScenePresence>();

             Prims = new Dictionary<LLUUID, SceneObject>();

 

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs - creating LandMap");

+            MainLog.Instance.Verbose("World.cs - creating LandMap");

             Terrain = new TerrainEngine();

 

             ScenePresence.LoadAnims();

@@ -151,7 +147,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>

         /// <param name="sender"></param>

         /// <param name="e"></param>

-        void Heartbeat(object sender, System.EventArgs e)

+        void Heartbeat(object sender, EventArgs e)

         {

             this.Update();

         }

@@ -170,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes
 

                 }

 

-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)

+                foreach (LLUUID UUID in Entities.Keys)

                 {

                     Entities[UUID].updateMovement();

                 }

@@ -180,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
                     this.phyScene.Simulate(timeStep);

                 }

 

-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)

+                foreach (LLUUID UUID in Entities.Keys)

                 {

                     Entities[UUID].update();

                 }

@@ -198,7 +194,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());

             }

             updateLock.ReleaseMutex();

 

@@ -237,14 +233,14 @@ namespace OpenSim.Region.Environment.Scenes
                     this.SendLayerData(client);

                 }

 

-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)

+                foreach (LLUUID UUID in Entities.Keys)

                 {

                     Entities[UUID].LandRenegerated();

                 }

             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

             }

         }

 

@@ -268,14 +264,14 @@ namespace OpenSim.Region.Environment.Scenes
                     this.SendLayerData(client);

                 }

 

-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)

+                foreach (LLUUID UUID in Entities.Keys)

                 {

                     Entities[UUID].LandRenegerated();

                 }

             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

             }

         }

 

@@ -301,7 +297,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

             }

         }

 

@@ -351,7 +347,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());

             }

         }

 

@@ -382,12 +378,12 @@ namespace OpenSim.Region.Environment.Scenes
         {

             try

             {

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");

+                MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");

                 this.localStorage.LoadPrimitives(this);

             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());

             }

         }

 

@@ -428,7 +424,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());

             }

         }

 

@@ -482,10 +478,10 @@ namespace OpenSim.Region.Environment.Scenes
         {

             ScenePresence newAvatar = null;

 

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

+            MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

             newAvatar = new ScenePresence(client, this, this.m_regInfo);

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Adding new avatar to world");

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Starting RegionHandshake ");

+            MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Adding new avatar to world");

+            MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Starting RegionHandshake ");

 

             PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);

             lock (this.m_syncRoot)

@@ -638,7 +634,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

         }

 

-        public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        public void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (regionHandle == this.m_regInfo.RegionHandle)

             {

diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 817f206..4036743 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -26,25 +26,20 @@
 * 

 */

 using System;

-using libsecondlife;

-using libsecondlife.Packets;

 using System.Collections.Generic;

-using System.Text;

 using System.Reflection;

-using System.IO;

-using System.Threading;

-using OpenSim.Physics.Manager;

+using libsecondlife;

+using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using OpenSim.Framework.Inventory;

-using OpenSim.Region.Terrain;

 using OpenSim.Region.Caches;

+using OpenSim.Region.Terrain;

 

 namespace OpenSim.Region.Environment.Scenes

 {

     public abstract class SceneBase :  IWorld 

     {

-        public Dictionary<libsecondlife.LLUUID, EntityBase> Entities;

+        public Dictionary<LLUUID, EntityBase> Entities;

         protected Dictionary<uint, IClientAPI> m_clientThreads;

         protected ulong m_regionHandle;

         protected string m_regionName;

@@ -113,7 +108,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());

+                MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());

                 return false;

             }

         }

@@ -191,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());

+                MainLog.Instance.WriteLine(LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());

             }

         }

 

diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index ac887c0..9e383c6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -1,6 +1,4 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

+using libsecondlife;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -18,7 +16,7 @@ namespace OpenSim.Region.Environment.Scenes
         public delegate void OnNewPrimitiveDelegate(PrimitiveOld prim);

         public event OnNewPrimitiveDelegate OnNewPrimitive;

 

-        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);

+        public delegate void OnRemovePresenceDelegate(LLUUID uuid);

         public event OnRemovePresenceDelegate OnRemovePresence;

 

         public void TriggerOnFrame()

@@ -41,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
                 OnNewPresence(presence);

         }

 

-        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)

+        public void TriggerOnRemovePresence(LLUUID uuid)

         {

             if (OnRemovePresence != null)

             {

diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index c03354e..04ed408 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -25,21 +25,18 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

 using System.Collections.Generic;

 using System.Text;

 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Physics.Manager;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Inventory;

 

 namespace OpenSim.Region.Environment.Scenes

 {

     public class SceneObject : EntityBase

     {

-        private System.Text.Encoding enc = System.Text.Encoding.ASCII;

+        private Encoding enc = Encoding.ASCII;

         private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group

         public Primitive rootPrimitive;

         private Scene m_world;

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 2caabc2..d1f75ed 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -25,11 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

 using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

 using System.Xml;

+using libsecondlife;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -66,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
 

                 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

 

-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)

+                foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)

                 {

                     AnimsNames.Add(kp.Value, kp.Key);

                 }

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index 2c81d2a..dbb5d3f 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -25,14 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

 using libsecondlife;

 using libsecondlife.Packets;

-using OpenSim.Physics.Manager;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Environment.Scenes

 {

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8a8f5ae..dcca848 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -28,14 +28,13 @@
 using System;

 using System.Collections.Generic;

 using System.IO;

-using System.Text;

+using Axiom.MathLib;

 using libsecondlife;

 using libsecondlife.Packets;

-using OpenSim.Physics.Manager;

-using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using Axiom.MathLib;

+using OpenSim.Physics.Manager;

 

 namespace OpenSim.Region.Environment.Scenes

 {

@@ -53,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
         private byte movementflag = 0;

         private List<NewForce> forcesList = new List<NewForce>();

         private short _updateCount = 0;

-        private Axiom.MathLib.Quaternion bodyRot;

+        private Quaternion bodyRot;

         private LLObject.TextureEntry avatarAppearanceTexture = null;

         private byte[] visualParams;

         private AvatarWearable[] Wearables;

@@ -110,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes
 

             m_regionInfo = reginfo;

             m_regionHandle = reginfo.RegionHandle;

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");

+            MainLog.Instance.Verbose("Avatar.cs ");

             ControllingClient = theClient;

             this.firstname = ControllingClient.FirstName;

             this.lastname = ControllingClient.LastName;

@@ -240,7 +239,7 @@ namespace OpenSim.Region.Environment.Scenes
             bool update_rotation = false;

             bool DCFlagKeyPressed = false;

             Vector3 agent_control_v3 = new Vector3(0, 0, 0);

-            Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);

+            Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);

 

             this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);

 

@@ -278,10 +277,10 @@ namespace OpenSim.Region.Environment.Scenes
 

         }

 

-        protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)

+        protected void AddNewMovement(Vector3 vec, Quaternion rotation)

         {

             NewForce newVelocity = new NewForce();

-            Axiom.MathLib.Vector3 direc = rotation * vec;

+            Vector3 direc = rotation * vec;

             direc.Normalize();

 

             direc = direc * ((0.03f) * 128f);

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index fc193f5..56f5c0b 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -26,13 +26,10 @@
 * 

 */

 using System;

-using System.Collections.Generic;

-using System.Text;

-

-// Compilation stuff

-using System.CodeDom;

 using System.CodeDom.Compiler;

+using System.Collections.Generic;

 using Microsoft.CSharp;

+using OpenSim.Framework.Console;

 

 namespace OpenSim.Region.Enviorment.Scripting

 {

@@ -60,10 +57,10 @@ namespace OpenSim.Region.Enviorment.Scripting
 

             if (compilerResults.Errors.Count > 0)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");

+                MainLog.Instance.Error("Compile errors");

                 foreach (CompilerError error in compilerResults.Errors)

                 {

-                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());

+                    MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());

                 }

             }

             else

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index e6d66eb..2cea6e0 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -26,13 +26,10 @@
 * 

 */

 using System;

-using System.Collections.Generic;

-using System.Text;

-

-// Compilation stuff

-using System.CodeDom;

 using System.CodeDom.Compiler;

+using System.Collections.Generic;

 using Microsoft.JScript;

+using OpenSim.Framework.Console;

 

 namespace OpenSim.Region.Enviorment.Scripting

 {

@@ -60,10 +57,10 @@ namespace OpenSim.Region.Enviorment.Scripting
 

             if (compilerResults.Errors.Count > 0)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");

+                MainLog.Instance.Error("Compile errors");

                 foreach (CompilerError error in compilerResults.Errors)

                 {

-                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());

+                    MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());

                 }

             }

             else

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 1e64675..8029883 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -25,13 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Framework.Console;

-using OpenSim.Framework;

-using OpenSim.Region.Environment;

 using OpenSim.Region.Environment.Scenes;

 

 namespace OpenSim.Region.Enviorment.Scripting

@@ -54,7 +47,7 @@ namespace OpenSim.Region.Enviorment.Scripting
         public void Initialise(ScriptInfo scriptInfo)

         {

             script = scriptInfo;

-            script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);

+            script.events.OnFrame += new EventManager.OnFrameDelegate(events_OnFrame);

             script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);

         }

 

diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index 522a572..d984d60 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -25,12 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Region.Environment.Scenes;

 using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Scenes;

 

 namespace OpenSim.Region.Enviorment.Scripting

 {

@@ -52,7 +48,7 @@ namespace OpenSim.Region.Enviorment.Scripting
         {

             world = scene;

             events = world.eventManager;

-            logger = OpenSim.Framework.Console.MainLog.Instance;

+            logger = MainLog.Instance;

         }

     }

 }

diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index eb1c1d9..1d47c24 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -25,16 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

 using System.Collections.Generic;

-using System.Text;

+using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Scenes;

 

 namespace OpenSim.Region.Enviorment.Scripting

 {

     public class ScriptManager

     {

         List<IScript> scripts = new List<IScript>();

-        OpenSim.Region.Environment.Scenes.Scene scene;

+        Scene scene;

         Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();

 

         private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)

@@ -42,14 +42,14 @@ namespace OpenSim.Region.Enviorment.Scripting
             foreach (KeyValuePair<string, IScript> script in compiledscripts)

             {

                 ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading " + script.Key);

+                MainLog.Instance.Verbose("Loading " + script.Key);

                 script.Value.Initialise(scriptInfo);

                 scripts.Add(script.Value);

             }

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");

+            MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");

         }

 

-        public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)

+        public ScriptManager(Scene world)

         {

             scene = world;

 

@@ -82,7 +82,7 @@ namespace OpenSim.Region.Enviorment.Scripting
                     break;

 

                 default:

-                    OpenSim.Framework.Console.MainLog.Instance.Error("Unknown script command");

+                    MainLog.Instance.Error("Unknown script command");

                     break;

             }

         }