* Optimized usings (the 'LL ate my scripts' commit)

* added some licensing info

OpenSim/Framework/Communications/CommunicationsManager.cs

@@ -25,16 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Text;
-using OpenSim.Framework;
+using libsecondlife;
+using libsecondlife.Packets;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using libsecondlife;
-using libsecondlife.Packets;
 
 namespace OpenSim.Framework.Communications
 {
@@ -54,7 +50,7 @@ namespace OpenSim.Framework.Communications
         #region Packet Handlers
         public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
         {
-            System.Text.Encoding enc = System.Text.Encoding.ASCII;
+            Encoding enc = Encoding.ASCII;
             UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
             if (profileData != null)
             {

OpenSim/Framework/Communications/IGridServices.cs

@@ -26,11 +26,8 @@
 * 
 */
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework.Types;
-using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {

OpenSim/Framework/Communications/IInterRegionCommunications.cs

@@ -25,17 +25,14 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
+using libsecondlife;
-using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework.Types;
-using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {
     public  interface IInterRegionCommunications
     {
          bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
-         bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 
+         bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position); 
     }
 }

OpenSim/Framework/Communications/IUserServices.cs

@@ -25,11 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
-
 using OpenSim.Framework.Data;
 
 namespace OpenSim.Framework.Communications

OpenSim/Framework/Communications/Properties/AssemblyInfo.cs

@@ -26,9 +26,7 @@
 * 
 */
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/Console/AssemblyInfo.cs

@@ -26,9 +26,7 @@
 * 
 */
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // Information about this assembly is defined by the following
 // attributes.
 //

OpenSim/Framework/Console/ConsoleCallbacksBase.cs

@@ -25,10 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework.Console
 {    
     public interface conscmd_callback

OpenSim/Framework/Console/LogBase.cs

@@ -120,7 +120,7 @@ namespace OpenSim.Framework.Console
             return;
         }
 
-        private void WriteNewLine(System.ConsoleColor color, string format, params object[] args)
+        private void WriteNewLine(ConsoleColor color, string format, params object[] args)
         {
             Log.WriteLine(format, args);
             Log.Flush();
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console
                     System.Console.WriteLine(format, args);
                     System.Console.ResetColor();
                 }
-                catch (System.ArgumentNullException)
+                catch (ArgumentNullException)
                 {
                     // Some older systems dont support coloured text.
                     System.Console.WriteLine(format, args);
@@ -162,14 +162,14 @@ namespace OpenSim.Framework.Console
 
             while (true)
             {
-                addressStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue);
+                addressStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
                 if (IPAddress.TryParse(addressStr, out address))
                 {
                     break;
                 }
                 else
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter.");
+                    MainLog.Instance.Error("Illegal address. Please re-enter.");
                 }
             }
 
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
 
             while (true)
             {
-                portStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue);
+                portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
                 if (int.TryParse(portStr, out port))
                 {
                     if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort)
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Console
                     }
                 }
 
-                OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter.");
+                MainLog.Instance.Error("Illegal address. Please re-enter.");
             }
 
             return port;

OpenSim/Framework/Console/MainLog.cs

@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-
 namespace OpenSim.Framework.Console
 {
 	public class MainLog {

OpenSim/Framework/Data.DB4o/DB4oGridData.cs

@@ -27,12 +27,8 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Data;
 using libsecondlife;
 
-
 namespace OpenSim.Framework.Data.DB4o
 {
     /// <summary>

OpenSim/Framework/Data.DB4o/DB4oManager.cs

@@ -27,9 +27,7 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Db4objects.Db4o;
-using OpenSim.Framework.Data;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data.DB4o

OpenSim/Framework/Data.DB4o/DB4oUserData.cs

@@ -26,9 +26,6 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Data;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data.DB4o

OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs

@@ -27,8 +27,10 @@
 */
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Security.Cryptography;
 using System.Text;
-using OpenSim.Framework.Data;
+using libsecondlife;
 
 namespace OpenSim.Framework.Data.MSSQL
 {
@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.MSSQL
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["handle"] = handle.ToString();
 
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
+            IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
+            IDataReader reader = result.ExecuteReader();
 
             SimProfileData row = database.getRow(reader);
             reader.Close();
@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.MSSQL
         /// </summary>
         /// <param name="uuid">The region UUID</param>
         /// <returns>The sim profile</returns>
-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
+        public SimProfileData GetProfileByLLUUID(LLUUID uuid)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["uuid"] = uuid.ToStringHyphenated();
 
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
+            IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
+            IDataReader reader = result.ExecuteReader();
 
             SimProfileData row = database.getRow(reader);
             reader.Close();
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.MSSQL
         /// <param name="handle">The attempted regionHandle of the challenger</param>
         /// <param name="authkey">The secret</param>
         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.MSSQL
         /// <param name="authhash"></param>
         /// <param name="challenge"></param>
         /// <returns></returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
         {
-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
+            SHA512Managed HashProvider = new SHA512Managed();
-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+            ASCIIEncoding TextProvider = new ASCIIEncoding();
 
             byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
             byte[] hash = HashProvider.ComputeHash(stream);

OpenSim/Framework/Data.MSSQL/MSSQLManager.cs

@@ -27,12 +27,9 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Data;
-
 using System.Data.SqlClient;
-
+using libsecondlife;
-using OpenSim.Framework.Data;
 
 namespace OpenSim.Framework.Data.MSSQL
 {
@@ -110,7 +107,7 @@ namespace OpenSim.Framework.Data.MSSQL
                 // Region Main
                 regionprofile.regionHandle = (ulong)reader["regionHandle"];
                 regionprofile.regionName = (string)reader["regionName"];
-                regionprofile.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
+                regionprofile.UUID = new LLUUID((string)reader["uuid"]);
 
                 // Secrets
                 regionprofile.regionRecvKey = (string)reader["regionRecvKey"];

OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/Data.MySQL/MySQLGridData.cs

@@ -27,8 +27,10 @@
 */
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Security.Cryptography;
 using System.Text;
-using OpenSim.Framework.Data;
+using libsecondlife;
 
 namespace OpenSim.Framework.Data.MySQL
 {
@@ -104,8 +106,8 @@ namespace OpenSim.Framework.Data.MySQL
                     param["?xmax"] = xmax.ToString();
                     param["?ymax"] = ymax.ToString();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
+                    IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     SimProfileData row;
 
@@ -144,8 +146,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?handle"] = handle.ToString();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
+                    IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     SimProfileData row = database.readSimRow(reader);
                     reader.Close();
@@ -167,7 +169,7 @@ namespace OpenSim.Framework.Data.MySQL
         /// </summary>
         /// <param name="uuid">The region UUID</param>
         /// <returns>The sim profile</returns>
-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
+        public SimProfileData GetProfileByLLUUID(LLUUID uuid)
         {
             try
             {
@@ -176,8 +178,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = uuid.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     SimProfileData row = database.readSimRow(reader);
                     reader.Close();
@@ -221,7 +223,7 @@ namespace OpenSim.Framework.Data.MySQL
         /// <param name="handle">The attempted regionHandle of the challenger</param>
         /// <param name="authkey">The secret</param>
         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
@@ -242,10 +244,10 @@ namespace OpenSim.Framework.Data.MySQL
         /// <param name="authhash"></param>
         /// <param name="challenge"></param>
         /// <returns></returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
         {
-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
+            SHA512Managed HashProvider = new SHA512Managed();
-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+            ASCIIEncoding TextProvider = new ASCIIEncoding();
 
             byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
             byte[] hash = HashProvider.ComputeHash(stream);
@@ -262,8 +264,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?x"] = x.ToString();
                     param["?y"] = y.ToString();
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
+                    IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     ReservationData row = database.readReservationRow(reader);
                     reader.Close();

OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs

@@ -27,7 +27,7 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Data;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data.MySQL
@@ -98,8 +98,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = folderID.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     List<InventoryItemBase> items = database.readInventoryItems(reader);
 
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.Data.MySQL
                     param["?uuid"] = user.ToStringHyphenated();
                     param["?zero"] = LLUUID.Zero.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     List<InventoryFolderBase> items = database.readInventoryFolders(reader);
 
@@ -165,8 +165,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = parentID.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     List<InventoryFolderBase> items = database.readInventoryFolders(reader);
 
@@ -198,8 +198,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = item.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     List<InventoryItemBase> items = database.readInventoryItems(reader);
 
@@ -238,8 +238,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = folder.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     List<InventoryFolderBase> items = database.readInventoryFolders(reader);
 

OpenSim/Framework/Data.MySQL/MySQLLogData.cs

@@ -26,8 +26,6 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework.Data.MySQL
 {

OpenSim/Framework/Data.MySQL/MySQLManager.cs

@@ -27,17 +27,10 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Data;
-
+using libsecondlife;
-// MySQL Native
-using MySql;
-using MySql.Data;
-using MySql.Data.Types;
 using MySql.Data.MySqlClient;
 
-using OpenSim.Framework.Data;
-
 namespace OpenSim.Framework.Data.MySQL
 {
     /// <summary>
@@ -71,7 +64,7 @@ namespace OpenSim.Framework.Data.MySQL
 
                 dbcon.Open();
 
-                System.Console.WriteLine("MySQL connection established");
+                Console.WriteLine("MySQL connection established");
             }
             catch (Exception e)
             {
@@ -187,7 +180,7 @@ namespace OpenSim.Framework.Data.MySQL
                 // Region Main
                 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
                 retval.regionName = (string)reader["regionName"];
-                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
+                retval.UUID = new LLUUID((string)reader["uuid"]);
 
                 // Secrets
                 retval.regionRecvKey = (string)reader["regionRecvKey"];
@@ -226,11 +219,11 @@ namespace OpenSim.Framework.Data.MySQL
                 string tempRegionMap = reader["regionMapTexture"].ToString();
                 if (tempRegionMap != "")
                 {
-                    retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap);
+                    retval.regionMapTextureID = new LLUUID(tempRegionMap);
                 }
                 else
                 {
-                    retval.regionMapTextureID = new libsecondlife.LLUUID();
+                    retval.regionMapTextureID = new LLUUID();
                 }
             }
             else
@@ -259,7 +252,7 @@ namespace OpenSim.Framework.Data.MySQL
                 retval.reservationMinY = (int)reader["resYMin"];
                 retval.reservationName = (string)reader["resName"];
                 retval.status = (bool)reader["status"];
-                retval.userUUID = new libsecondlife.LLUUID((string)reader["userUUID"]);
+                retval.userUUID = new LLUUID((string)reader["userUUID"]);
 
             }
             else
@@ -280,9 +273,9 @@ namespace OpenSim.Framework.Data.MySQL
             if (reader.Read())
             {
                 // Agent IDs
-                retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]);
+                retval.UUID = new LLUUID((string)reader["UUID"]);
-                retval.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]);
+                retval.sessionID = new LLUUID((string)reader["sessionID"]);
-                retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]);
+                retval.secureSessionID = new LLUUID((string)reader["secureSessionID"]);
 
                 // Agent Who?
                 retval.agentIP = (string)reader["agentIP"];
@@ -296,7 +289,7 @@ namespace OpenSim.Framework.Data.MySQL
                 // Current position
                 retval.currentRegion = (string)reader["currentRegion"];
                 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
-                libsecondlife.LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
+                LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
             }
             else
             {
@@ -316,7 +309,7 @@ namespace OpenSim.Framework.Data.MySQL
 
             if (reader.Read())
             {
-                retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]);
+                retval.UUID = new LLUUID((string)reader["UUID"]);
                 retval.username = (string)reader["username"];
                 retval.surname = (string)reader["lastname"];
 
@@ -324,11 +317,11 @@ namespace OpenSim.Framework.Data.MySQL
                 retval.passwordSalt = (string)reader["passwordSalt"];
 
                 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.homeLocation = new libsecondlife.LLVector3(
+                retval.homeLocation = new LLVector3(
                     Convert.ToSingle(reader["homeLocationX"].ToString()),
                     Convert.ToSingle(reader["homeLocationY"].ToString()),
                     Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.homeLookAt = new libsecondlife.LLVector3(
+                retval.homeLookAt = new LLVector3(
                     Convert.ToSingle(reader["homeLookAtX"].ToString()),
                     Convert.ToSingle(reader["homeLookAtY"].ToString()),
                     Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -345,8 +338,8 @@ namespace OpenSim.Framework.Data.MySQL
                 retval.profileAboutText = (string)reader["profileAboutText"];
                 retval.profileFirstText = (string)reader["profileFirstText"];
 
-                retval.profileImage = new libsecondlife.LLUUID((string)reader["profileImage"]);
+                retval.profileImage = new LLUUID((string)reader["profileImage"]);
-                retval.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]);
+                retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
 
             }
             else
@@ -371,9 +364,9 @@ namespace OpenSim.Framework.Data.MySQL
                 {
                     InventoryFolderBase folder = new InventoryFolderBase();
 
-                    folder.agentID = new libsecondlife.LLUUID((string)reader["agentID"]);
+                    folder.agentID = new LLUUID((string)reader["agentID"]);
-                    folder.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
+                    folder.parentID = new LLUUID((string)reader["parentFolderID"]);
-                    folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]);
+                    folder.folderID = new LLUUID((string)reader["folderID"]);
                     folder.name = (string)reader["folderName"];
 
                     rows.Add(folder);
@@ -402,14 +395,14 @@ namespace OpenSim.Framework.Data.MySQL
                 {
                     InventoryItemBase item = new InventoryItemBase();
 
-                    item.assetID = new libsecondlife.LLUUID((string)reader["assetID"]);
+                    item.assetID = new LLUUID((string)reader["assetID"]);
-                    item.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]);
+                    item.avatarID = new LLUUID((string)reader["avatarID"]);
                     item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
                     item.inventoryDescription = (string)reader["inventoryDescription"];
-                    item.inventoryID = new libsecondlife.LLUUID((string)reader["inventoryID"]);
+                    item.inventoryID = new LLUUID((string)reader["inventoryID"]);
                     item.inventoryName = (string)reader["inventoryName"];
                     item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
-                    item.parentFolderID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
+                    item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
                     item.type = Convert.ToInt32(reader["type"].ToString());
 
                     rows.Add(item);

OpenSim/Framework/Data.MySQL/MySQLUserData.cs

@@ -27,8 +27,7 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Data;
-using OpenSim.Framework.Data;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data.MySQL
@@ -87,8 +86,8 @@ namespace OpenSim.Framework.Data.MySQL
                     param["?first"] = user;
                     param["?second"] = last;
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
+                    IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     UserProfileData row = database.readUserRow(reader);
                     
@@ -120,8 +119,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = uuid.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     UserProfileData row = database.readUserRow(reader);
 
@@ -175,8 +174,8 @@ namespace OpenSim.Framework.Data.MySQL
                     Dictionary<string, string> param = new Dictionary<string, string>();
                     param["?uuid"] = uuid.ToStringHyphenated();
 
-                    System.Data.IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
+                    IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
-                    System.Data.IDataReader reader = result.ExecuteReader();
+                    IDataReader reader = result.ExecuteReader();
 
                     UserAgentData row = database.readAgentRow(reader);
 

OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/Data.SQLite/SQLiteGridData.cs

@@ -27,8 +27,10 @@
 */
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Security.Cryptography;
 using System.Text;
-using OpenSim.Framework.Data;
+using libsecondlife;
 
 namespace OpenSim.Framework.Data.SQLite
 {
@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.SQLite
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["handle"] = handle.ToString();
 
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
+            IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
+            IDataReader reader = result.ExecuteReader();
 
             SimProfileData row = database.getRow(reader);
             reader.Close();
@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.SQLite
         /// </summary>
         /// <param name="uuid">The region UUID</param>
         /// <returns>The sim profile</returns>
-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
+        public SimProfileData GetProfileByLLUUID(LLUUID uuid)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["uuid"] = uuid.ToStringHyphenated();
 
-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
+            IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
-            System.Data.IDataReader reader = result.ExecuteReader();
+            IDataReader reader = result.ExecuteReader();
 
             SimProfileData row = database.getRow(reader);
             reader.Close();
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="handle">The attempted regionHandle of the challenger</param>
         /// <param name="authkey">The secret</param>
         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="authhash"></param>
         /// <param name="challenge"></param>
         /// <returns></returns>
-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
         {
-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
+            SHA512Managed HashProvider = new SHA512Managed();
-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+            ASCIIEncoding TextProvider = new ASCIIEncoding();
 
             byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
             byte[] hash = HashProvider.ComputeHash(stream);

OpenSim/Framework/Data.SQLite/SQLiteManager.cs

@@ -27,12 +27,9 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Data;
-
 using System.Data.SQLite;
-
+using libsecondlife;
-using OpenSim.Framework.Data;
 
 namespace OpenSim.Framework.Data.SQLite
 {
@@ -105,7 +102,7 @@ namespace OpenSim.Framework.Data.SQLite
                 // Region Main
                 retval.regionHandle = (ulong)reader["regionHandle"];
                 retval.regionName = (string)reader["regionName"];
-                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
+                retval.UUID = new LLUUID((string)reader["uuid"]);
 
                 // Secrets
                 retval.regionRecvKey = (string)reader["regionRecvKey"];

OpenSim/Framework/Data/GridData.cs

@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
+using libsecondlife;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework.Data
 {
@@ -56,7 +54,7 @@ namespace OpenSim.Framework.Data
         /// </summary>
         /// <param name="UUID">A 128bit UUID</param>
         /// <returns>A sim profile</returns>
-        SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID);
+        SimProfileData GetProfileByLLUUID(LLUUID UUID);
 
         /// <summary>
         /// Returns all profiles within the specified range
@@ -76,7 +74,7 @@ namespace OpenSim.Framework.Data
         /// <param name="regionHandle">The regionhandle sent by the sim</param>
         /// <param name="simrecvkey">The recieving key sent by the sim</param>
         /// <returns>Whether the sim has been authenticated</returns>
-        bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey);
+        bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
 
         /// <summary>
         /// Initialises the interface

OpenSim/Framework/Data/ILogData.cs

@@ -25,10 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework.Data
 {
     /// <summary>

OpenSim/Framework/Data/IniConfig.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 System.IO;
 using System.Text.RegularExpressions;
-
 /* 
  Taken from public code listing at by Alex Pinsker
  http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html

OpenSim/Framework/Data/InventoryData.cs

@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data

OpenSim/Framework/Data/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/Data/ReservationData.cs

@@ -25,10 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 using libsecondlife;
 
 namespace OpenSim.Framework.Data

OpenSim/Framework/Data/SimProfileData.cs

@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
+using libsecondlife;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework.Data
 {
@@ -49,7 +47,7 @@ namespace OpenSim.Framework.Data
         /// <summary>
         /// OGS/OpenSim Specific ID for a region
         /// </summary>
-        public libsecondlife.LLUUID UUID;
+        public LLUUID UUID;
 
         /// <summary>
         /// Coordinates of the region
@@ -109,6 +107,6 @@ namespace OpenSim.Framework.Data
         /// <summary>
         /// Region Map Texture Asset
         /// </summary>
-        public libsecondlife.LLUUID regionMapTextureID = new libsecondlife.LLUUID("00000000-0000-0000-9999-000000000006");
+        public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
     }
 }

OpenSim/Framework/Data/UserData.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data

OpenSim/Framework/Data/UserProfileData.cs

@@ -26,8 +26,6 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data

OpenSim/Framework/General/AgentInventory.cs

@@ -25,9 +25,7 @@
 * 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.Types;

OpenSim/Framework/General/AuthenticateSessionBase.cs

@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

OpenSim/Framework/General/BlockingQueue.cs

@@ -25,10 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Threading;
 using System.Collections.Generic;
-using System.Text;
+using System.Threading;
 
 namespace OpenSim.Framework.Utilities
 {

OpenSim/Framework/General/IRegionCommsListener.cs

@@ -25,9 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
+using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
@@ -35,7 +34,7 @@ namespace OpenSim.Framework
 {
     public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
     public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
-    public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
+    public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
 
     public interface IRegionCommsListener
     {

OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs

@@ -25,14 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using libsecondlife;
-using OpenSim;
 using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Interfaces

OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs

@@ -25,10 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework.Interfaces
 {
     public interface IGenericConfig

OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs

@@ -26,10 +26,6 @@
 * 
 */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using libsecondlife;
 //using OpenSim.world;
 
 namespace OpenSim.Framework.Interfaces

OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs

@@ -26,10 +26,6 @@
 * 
 */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using libsecondlife;
 //using OpenSim.world;
 
 namespace OpenSim.Framework.Interfaces

OpenSim/Framework/General/Interfaces/IAssetServer.cs

@@ -25,11 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
 using libsecondlife;
 using OpenSim.Framework.Types;
 

OpenSim/Framework/General/Interfaces/IClientAPI.cs

@@ -25,14 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Net;
-using OpenSim.Framework.Inventory;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Types;
-using System.Net;
 
 namespace OpenSim.Framework.Interfaces
 {

OpenSim/Framework/General/Interfaces/ILocalStorage.cs

@@ -26,7 +26,6 @@
 * 
 */
 
-using System;
 using libsecondlife;
 using OpenSim.Framework.Types;
 

OpenSim/Framework/General/Interfaces/IUserServer.cs

@@ -25,11 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Inventory;
 using libsecondlife;
+using OpenSim.Framework.Inventory;
 
 namespace OpenSim.Framework.Interfaces
 {

OpenSim/Framework/General/Interfaces/IWorld.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Types;
 

OpenSim/Framework/General/LoginService.cs

@@ -25,13 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using Nwc.XmlRpc;
-using libsecondlife;
-
 namespace OpenSim.Framework.Grid
 {
     public abstract class LoginService

OpenSim/Framework/General/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/General/RegionCommsListener.cs

@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
+using libsecondlife;
-using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
@@ -57,7 +55,7 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
         {
             if (OnAvatarCrossingIntoRegion != null)
             {

OpenSim/Framework/General/Remoting.cs

@@ -26,9 +26,8 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Security.Cryptography;
+using System.Text;
 
 namespace OpenSim.Framework
 {

OpenSim/Framework/General/SimProfile.cs

@@ -26,10 +26,7 @@
 * 
 */
 using System;
-using System.Collections.Generic;
 using System.Collections;
-using System.Xml;
-using System.Text;
 using libsecondlife;
 using Nwc.XmlRpc;
 

OpenSim/Framework/General/Types/AgentCiruitData.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/AgentWearable.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/AssetBase.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/AssetLandmark.cs

@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
@@ -51,7 +49,7 @@ namespace OpenSim.Framework.Types
 
         private void InternData()
         {
-            string temp = System.Text.Encoding.UTF8.GetString(Data).Trim(); 
+            string temp = Encoding.UTF8.GetString(Data).Trim(); 
             string[] parts = temp.Split('\n');
             int.TryParse(parts[0].Substring(17, 1), out Version);
             LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);

OpenSim/Framework/General/Types/AssetStorage.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/EstateSettings.cs

@@ -26,10 +26,6 @@
 * 
 */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 using libsecondlife;
 
 namespace OpenSim.Framework.Types
@@ -46,8 +42,8 @@ namespace OpenSim.Framework.Types
 
         public int redirectGridX = 0; //??
         public int redirectGridY = 0; //??
-        public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings
+        public Simulator.RegionFlags regionFlags = Simulator.RegionFlags.None; //Booleam values of various region settings
-        public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
+        public Simulator.SimAccess simAccess = Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
         public float sunHour = 0;
 
         public float terrainRaiseLimit = 0;

OpenSim/Framework/General/Types/Login.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/MapBlockData.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/NeighbourInfo.cs

@@ -25,14 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using libsecondlife;
-
 namespace OpenSim.Framework.Types
 {
     public class NeighbourInfo

OpenSim/Framework/General/Types/NetworkServersInfo.cs

@@ -26,8 +26,7 @@
 * 
 */
 using System;
-using System.Collections.Generic;
+using OpenSim.Framework.Console;
-using System.Text;
 using OpenSim.Framework.Interfaces;
 
 namespace OpenSim.Framework.Types
@@ -63,7 +62,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("HttpListenerPort");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
+                    string location = MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
                     configData.SetAttribute("HttpListenerPort", location);
                     this.HttpListenerPort = Convert.ToInt32(location);
                 }
@@ -76,7 +75,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("RemotingListenerPort");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
+                    string location = MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
                     configData.SetAttribute("RemotingListenerPort", location);
                     this.RemotingListenerPort = Convert.ToInt32(location);
                 }
@@ -92,7 +91,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("DefaultLocationX");
                     if (attri == "")
                     {
-                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
+                        string location = MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
                         configData.SetAttribute("DefaultLocationX", location);
                         this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
                     }
@@ -106,7 +105,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("DefaultLocationY");
                     if (attri == "")
                     {
-                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
+                        string location = MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
                         configData.SetAttribute("DefaultLocationY", location);
                         this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
                     }
@@ -122,7 +121,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridServerURL");
                     if (attri == "")
                     {
-                        this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
+                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
                         configData.SetAttribute("GridServerURL", this.GridURL);
                     }
                     else
@@ -135,7 +134,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridSendKey");
                     if (attri == "")
                     {
-                        this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
+                        this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
                         configData.SetAttribute("GridSendKey", this.GridSendKey);
                     }
                     else
@@ -148,7 +147,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridRecvKey");
                     if (attri == "")
                     {
-                        this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
+                        this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
                         configData.SetAttribute("GridRecvKey", this.GridRecvKey);
                     }
                     else
@@ -161,7 +160,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("UserServerURL");
                     if (attri == "")
                     {
-                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+                        this.UserURL= MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
                         configData.SetAttribute("UserServerURL", this.UserURL);
                     }
                     else
@@ -174,7 +173,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("UserSendKey");
                     if (attri == "")
                     {
-                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+                        this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server", "null");
                         configData.SetAttribute("UserSendKey", this.UserSendKey);
                     }
                     else
@@ -187,7 +186,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("UserRecvKey");
                     if (attri == "")
                     {
-                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+                        this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
                         configData.SetAttribute("GridRecvKey", this.UserRecvKey);
                     }
                     else
@@ -199,7 +198,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("AssetServerURL");
                     if (attri == "")
                     {
-                        this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
+                        this.AssetURL = MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
                         configData.SetAttribute("AssetServerURL", this.GridURL);
                     }
                     else
@@ -212,8 +211,8 @@ namespace OpenSim.Framework.Types
             }
             catch (Exception e)
             {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+                MainLog.Instance.Warn(e.ToString());
             }
         }
     }

OpenSim/Framework/General/Types/ParcelData.cs

@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types
@@ -45,14 +42,14 @@ namespace OpenSim.Framework.Types
             public int area = 0;
             public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
             public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
-            public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
+            public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
             public int claimDate = 0; //Unemplemented
             public int claimPrice = 0; //Unemplemented
             public LLUUID groupID = new LLUUID(); //Unemplemented
             public int groupPrims = 0; //Unemplemented
             public int salePrice = 0; //Unemeplemented. Parcels price.
-            public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None;
+            public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.None;
-            public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
+            public Parcel.ParcelFlags parcelFlags = Parcel.ParcelFlags.None;
             public byte landingType = 0;
             public byte mediaAutoScale = 0;
             public LLUUID mediaID = LLUUID.Zero;

OpenSim/Framework/General/Types/PrimData.cs

@@ -26,8 +26,6 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/PrimitiveBaseShape.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
 
 namespace OpenSim.Framework.Types
 {

OpenSim/Framework/General/Types/RegionHandle.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Net;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/Types/RegionInfo.cs

@@ -26,14 +26,13 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using libsecondlife;
+using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using libsecondlife;
-using System.Net;
 
 namespace OpenSim.Framework.Types
 {
@@ -65,7 +64,7 @@ namespace OpenSim.Framework.Types
                     if (ia == null)
                         ia = Adr;
 
-                    if (Adr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                    if (Adr.AddressFamily == AddressFamily.InterNetwork)
                     {
                         ia = Adr;
                         break;
@@ -170,7 +169,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationX");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
+                    string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000");
                     configData.SetAttribute("SimLocationX", location);
                     m_regionLocX = (uint)Convert.ToUInt32(location);
                 }
@@ -183,7 +182,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationY");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
+                    string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
                     configData.SetAttribute("SimLocationY", location);
                     m_regionLocY = (uint)Convert.ToUInt32(location);
                 }
@@ -209,7 +208,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("TerrainMultiplier");
                 if (attri == "")
                 {
-                    string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
+                    string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
                     this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
                     configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
                 }
@@ -222,7 +221,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("MasterAvatarFirstName");
                 if (attri == "")
                 {
-                    this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
+                    this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
 
                     configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
                 }
@@ -235,7 +234,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("MasterAvatarLastName");
                 if (attri == "")
                 {
-                    this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
+                    this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
 
                     configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
                 }
@@ -250,7 +249,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("MasterAvatarSandboxPassword");
                     if (attri == "")
                     {
-                        this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
+                        this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
 
                         //Should I store this?
                         configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
@@ -265,17 +264,17 @@ namespace OpenSim.Framework.Types
             }
             catch (Exception e)
             {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+                MainLog.Instance.Warn(e.ToString());
             }
 
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
+            MainLog.Instance.Verbose("Sim settings loaded:");
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
+            MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName);
+            MainLog.Instance.Verbose("Name: " + this.RegionName);
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
+            MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
+            MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
+            MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
+            MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
 
         }
 

OpenSim/Framework/General/Types/UUID.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types

OpenSim/Framework/General/UserProfile.cs

@@ -25,12 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Security.Cryptography;
 using libsecondlife;
 using OpenSim.Framework.Inventory;
-using System.Security.Cryptography;
 
 namespace OpenSim.Framework.User
 {

OpenSim/Framework/General/Util.cs

@@ -27,10 +27,8 @@
 */
 using System;
 using System.Security.Cryptography;
-using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-using libsecondlife.Packets;
 
 namespace OpenSim.Framework.Utilities
 {

OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs

@@ -26,8 +26,7 @@
 * 
 */
 using System;
-using System.Collections.Generic;
+using System.IO;
-using System.Text;
 using System.Xml;
 using OpenSim.Framework.Interfaces;
 
@@ -50,7 +49,7 @@ namespace OpenSim.GenericConfig
         {
             doc = new XmlDocument();
 
-            if (System.IO.File.Exists(fileName))
+            if (File.Exists(fileName))
             {
                 XmlTextReader reader = new XmlTextReader(fileName);
                 reader.WhitespaceHandling = WhitespaceHandling.None;

OpenSim/Framework/Servers/BaseHttpServer.cs

@@ -26,13 +26,14 @@
 * 
 */
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using Nwc.XmlRpc;
-using System.Collections;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Servers
@@ -199,9 +200,9 @@ namespace OpenSim.Framework.Servers
                 response.KeepAlive = false;
                 response.SendChunked = false;
 
-                System.IO.Stream body = request.InputStream;
+                Stream body = request.InputStream;
-                System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+                Encoding encoding = Encoding.UTF8;
-                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+                StreamReader reader = new StreamReader(body, encoding);
 
                 string requestBody = reader.ReadToEnd();
                 body.Close();
@@ -245,8 +246,8 @@ namespace OpenSim.Framework.Servers
 
                 }
 
-                byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
+                byte[] buffer = Encoding.UTF8.GetBytes(responseString);
-                System.IO.Stream output = response.OutputStream;
+                Stream output = response.OutputStream;
                 response.SendChunked = false;
                 response.ContentLength64 = buffer.Length;
                 output.Write(buffer, 0, buffer.Length);
@@ -260,7 +261,7 @@ namespace OpenSim.Framework.Servers
 
         public void Start()
         {
-            OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
+            MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
 
             m_workerThread = new Thread(new ThreadStart(StartHTTP));
             m_workerThread.IsBackground = true;
@@ -271,7 +272,7 @@ namespace OpenSim.Framework.Servers
         {
             try
             {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
+                MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
                 m_httpListener = new HttpListener();
 
                 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -286,7 +287,7 @@ namespace OpenSim.Framework.Servers
             }
             catch (Exception e)
             {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
+                MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
             }
         }
 

OpenSim/Framework/Servers/CheckSumServer.cs

@@ -25,21 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Console;
-
-
 namespace OpenSim.Framework.Servers
 {
 /*    public class CheckSumServer : UDPServerBase

OpenSim/Framework/Servers/ILlsdMethodHandler.cs

@@ -1,6 +1,30 @@
-using System;
+/*
-using System.Collections.Generic;
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-using System.Text;
+* 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.
+* 
+*/
 
 namespace OpenSim.Framework.Servers
 {

OpenSim/Framework/Servers/LlsdMethod.cs

@@ -1,6 +1,30 @@
-using System;
+/*
-using System.Collections.Generic;
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-using System.Text;
+* 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.
+* 
+*/
 
 namespace OpenSim.Framework.Servers
 {

OpenSim/Framework/Servers/RestMethod.cs

@@ -25,10 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework.Servers
 {
     public delegate string RestMethod( string request, string path, string param );

OpenSim/Framework/Servers/UDPServerBase.cs

@@ -26,16 +26,8 @@
 * 
 */
 using System;
-using System.Text;
-using System.IO;
-using System.Threading;
 using System.Net;
 using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
 using libsecondlife.Packets;
 
 namespace OpenSim.Framework.Servers

OpenSim/Framework/Servers/XmlRpcMethod.cs

@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using Nwc.XmlRpc;
 
 namespace OpenSim.Framework.Servers

OpenSim/Framework/UserManager/LoginResponse.cs

@@ -1,13 +1,8 @@
 using System;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
 using System.Collections;
-using System.Xml;
 using libsecondlife;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
 using Nwc.XmlRpc;
+using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.UserManagement
 {
@@ -227,7 +222,7 @@ namespace OpenSim.Framework.UserManagement
 
                 responseData["sim_port"] =(Int32) this.SimPort;
                 responseData["sim_ip"] = this.SimAddress;
-                Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
+                MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
                 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
                 responseData["session_id"] = this.SessionID.ToStringHyphenated();
                 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
@@ -266,8 +261,8 @@ namespace OpenSim.Framework.UserManagement
             }
             catch (Exception e)
             {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(
+                MainLog.Instance.WriteLine(
-                    OpenSim.Framework.Console.LogPriority.LOW,
+                    LogPriority.LOW,
                     "LoginResponse: Error creating XML-RPC Response: " + e.Message
                 );
                 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));

OpenSim/Framework/UserManager/UserManagerBase.cs

@@ -28,24 +28,21 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Data;
-using libsecondlife;
 using System.Reflection;
-
+using System.Security.Cryptography;
-using System.Xml;
+using libsecondlife;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Sims;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 
-using System.Security.Cryptography;
-
 namespace OpenSim.Framework.UserManagement
 {
     public abstract class UserManagerBase
     {
-        public OpenSim.Framework.Interfaces.UserConfig _config;
+        public UserConfig _config;
         Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
 
         /// <summary>
@@ -54,10 +51,10 @@ namespace OpenSim.Framework.UserManagement
         /// <param name="FileName">The filename to the user server plugin DLL</param>
         public void AddPlugin(string FileName)
         {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
+            MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+            MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
             foreach (Type pluginType in pluginAssembly.GetTypes())
             {
                 if (!pluginType.IsAbstract)
@@ -69,7 +66,7 @@ namespace OpenSim.Framework.UserManagement
                         IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         plug.Initialise();
                         this._plugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
+                        MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
                     }
 
                     typeInterface = null;
@@ -97,7 +94,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
 
@@ -122,7 +119,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
 
@@ -149,7 +146,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
 
@@ -173,7 +170,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
 
@@ -195,7 +192,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
 
@@ -218,7 +215,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
 
@@ -314,7 +311,7 @@ namespace OpenSim.Framework.UserManagement
         /// <returns>Authenticated?</returns>
         public virtual bool AuthenticateUser(UserProfileData profile, string password)
         {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose(
+            MainLog.Instance.Verbose(
                 "Authenticating " + profile.username + " " + profile.surname);
 
             password = password.Remove(0, 3); //remove $1$
@@ -517,7 +514,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
         }

OpenSim/Grid/AssetServer/AssetHttpServer.cs

@@ -26,15 +26,10 @@
 * 
 */
 using System;
-using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading;
-//using OpenSim.CAPS;
-using Nwc.XmlRpc;
-using System.Collections;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.AssetServer
@@ -69,9 +64,9 @@ namespace OpenSim.Grid.AssetServer
                 response.KeepAlive = false;
                 response.SendChunked = false;
 
-                System.IO.Stream body = request.InputStream;
+                Stream body = request.InputStream;
-                System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+                Encoding encoding = Encoding.UTF8;
-                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+                StreamReader reader = new StreamReader(body, encoding);
 
                 string requestBody = reader.ReadToEnd();
                 body.Close();
@@ -114,7 +109,7 @@ namespace OpenSim.Grid.AssetServer
 
                 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
                 byte[] buffer = Windows1252Encoding.GetBytes(responseString);
-                System.IO.Stream output = response.OutputStream;
+                Stream output = response.OutputStream;
                 response.SendChunked = false;
                 response.ContentLength64 = buffer.Length;
                 output.Write(buffer, 0, buffer.Length);

OpenSim/Grid/AssetServer/Main.cs

@@ -29,20 +29,10 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Timers;
+using Db4objects.Db4o;
-using System.Net;
-using System.Reflection;
-using System.Threading;
 using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Framework.Sims;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Servers;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
 
 namespace OpenSim.Grid.AssetServer
 {
@@ -81,7 +71,7 @@ namespace OpenSim.Grid.AssetServer
         private OpenAsset_Main()
         {
             m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
-            OpenSim.Framework.Console.MainLog.Instance = m_console;
+            MainLog.Instance = m_console;
         }
 
         public void Startup()
@@ -161,17 +151,17 @@ namespace OpenSim.Grid.AssetServer
 
         public void setupDB()
         {
-            bool yapfile = System.IO.File.Exists("assets.yap");
+            bool yapfile = File.Exists("assets.yap");
             try
             {
                 db = Db4oFactory.OpenFile("assets.yap");
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");
+                MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");
             }
             catch (Exception e)
             {
                 db.Close();
-                OpenSim.Framework.Console.MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
+                MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+                MainLog.Instance.Warn(e.ToString());
             }
             if (!yapfile)
             {
@@ -273,7 +263,7 @@ namespace OpenSim.Grid.AssetServer
         {
 
 
-            string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
+            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
             string fileName = Path.Combine(dataPath, filename);
             FileInfo fInfo = new FileInfo(fileName);
             long numBytes = fInfo.Length;

OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs

@@ -26,9 +26,7 @@
 * 
 */
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Grid/Framework.Manager/GridManagementAgent.cs

@@ -25,12 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
 using System.Collections;
-using System.Collections.Generic;
 using libsecondlife;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Servers;
 
 namespace OpenSim.Framework.Manager
 {

OpenSim/Grid/Framework.Manager/GridServerManager.cs

@@ -28,10 +28,9 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using Nwc.XmlRpc;
 using System.Threading;
 using libsecondlife;
+using Nwc.XmlRpc;
 
 namespace OpenSim.Framework.Manager {
 

OpenSim/Grid/GridServer.Config/AssemblyInfo.cs

@@ -26,9 +26,7 @@
 * 
 */
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // Information about this assembly is defined by the following
 // attributes.
 //

OpenSim/Grid/GridServer.Config/DbGridConfig.cs

@@ -26,10 +26,9 @@
 * 
 */
 using System;
-using System.Collections.Generic;
+using Db4objects.Db4o;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using Db4objects.Db4o;
 
 namespace OpenGrid.Config.GridConfigDb4o
 {
@@ -44,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o
         /// <returns>A grid configuration object</returns>
 		public GridConfig GetConfigObject()
 		{
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
+			MainLog.Instance.Verbose("Loading Db40Config dll");
 			return ( new DbGridConfig());
 		}
 	}
@@ -63,24 +62,24 @@ namespace OpenGrid.Config.GridConfigDb4o
         /// User configuration for the Grid Config interfaces
         /// </summary>
 		public void LoadDefaults() {
-			OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+			MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
 			
             // About the grid options
-			this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
+			this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
 
             // Asset Options
-			this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
+			this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
-            this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null");
+            this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
-            this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
+            this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
 
             // User Server Options
-	        this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
+	        this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
-        	this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null");
+        	this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
-        	this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null");
+        	this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
 
             // Region Server Options
-            this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null");
+            this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null");
-            this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null");
+            this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null");
 		}
 
         /// <summary>
@@ -95,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o
 				IObjectSet result = db.Get(typeof(DbGridConfig));
                 // Found?
 				if(result.Count==1) {
-					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
+					MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
 					foreach (DbGridConfig cfg in result) {
                         // Import each setting into this class
                         // Grid Settings
@@ -114,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o
 					}
                 // Create a new configuration object from this class
 				} else {
-					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+					MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
 
                     // Load default settings into this class
 					LoadDefaults();
 
                     // Saves to the database file...
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database");
+                    MainLog.Instance.Verbose( "Writing out default settings to local database");
 					db.Set(this);
 
                     // Closes file locks
 					db.Close();
 				}
 			} catch(Exception e) {
-				OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+				MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+                MainLog.Instance.Warn(e.ToString());
 			}
 			
             // Grid Settings
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:");
+			MainLog.Instance.Verbose("Grid settings loaded:");
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
+			MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
 
             // Asset Settings
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
+			MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
+			MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
+			MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
 
             // User Settings
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
+			MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
+			MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
+			MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
 
             // Region Settings
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
+			MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
+			MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
 		}
 	
         /// <summary>

OpenSim/Grid/GridServer/GridManager.cs

@@ -28,15 +28,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
-using OpenSim.Framework.Data;
+using System.Xml;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Sims;
 using libsecondlife;
 using Nwc.XmlRpc;
-using System.Xml;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -45,7 +44,7 @@ namespace OpenSim.Grid.GridServer
         Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
         Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
 
-        public OpenSim.Framework.Interfaces.GridConfig config;
+        public GridConfig config;
 
         /// <summary>
         /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
@@ -53,10 +52,10 @@ namespace OpenSim.Grid.GridServer
         /// <param name="FileName">The filename to the grid server plugin DLL</param>
         public void AddPlugin(string FileName)
 		{
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
+            MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
 			Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+            MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
 			foreach (Type pluginType in pluginAssembly.GetTypes())
 			{
                 if (!pluginType.IsAbstract)
@@ -69,7 +68,7 @@ namespace OpenSim.Grid.GridServer
                         IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         plug.Initialise();
                         this._plugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface");
+                        MainLog.Instance.Verbose("Storage: Added IGridData Interface");
                     }
 
                     typeInterface = null;
@@ -82,7 +81,7 @@ namespace OpenSim.Grid.GridServer
                         ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         plug.Initialise();
                         this._logplugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
+                        MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
                     }
 
                     typeInterface = null;
@@ -110,7 +109,7 @@ namespace OpenSim.Grid.GridServer
                 }
                 catch (Exception)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
+                    MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
                 }
             }
         }
@@ -120,7 +119,7 @@ namespace OpenSim.Grid.GridServer
         /// </summary>
         /// <param name="uuid">A UUID key of the region to return</param>
         /// <returns>A SimProfileData for the region</returns>
-        public SimProfileData getRegion(libsecondlife.LLUUID uuid)
+        public SimProfileData getRegion(LLUUID uuid)
         {
             foreach(KeyValuePair<string,IGridData> kvp in _plugins) {
                 try
@@ -129,7 +128,7 @@ namespace OpenSim.Grid.GridServer
                 }
                 catch (Exception)
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
+                    MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
                 }
             }
             return null;
@@ -150,7 +149,7 @@ namespace OpenSim.Grid.GridServer
                 }
                 catch
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
+                    MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
                 }
             }
             return null;
@@ -174,7 +173,7 @@ namespace OpenSim.Grid.GridServer
                 }
                 catch
                 {
-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
+                    MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
                 }
             }
 
@@ -370,7 +369,7 @@ namespace OpenSim.Grid.GridServer
 
                     simProfileList.Add(simProfileBlock);
                 }
-                OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
+                MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
             }
             else
             {
@@ -403,7 +402,7 @@ namespace OpenSim.Grid.GridServer
                         }
                     }
                 }
-                OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
+                MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
             }
 
             responseData["sim-profiles"] = simProfileList;
@@ -565,7 +564,7 @@ namespace OpenSim.Grid.GridServer
             
             try
             {
-                OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
+                MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
                 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
                 {
                     try
@@ -575,7 +574,7 @@ namespace OpenSim.Grid.GridServer
                         if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null))
                         {
                             kvp.Value.AddProfile(TheSim);
-                            OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
+                            MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
                             logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
                         }
                         else
@@ -585,7 +584,7 @@ namespace OpenSim.Grid.GridServer
                     }
                     catch (Exception e)
                     {
-                        OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
+                        MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
                     }
                 }
                 return "OK";

OpenSim/Grid/GridServer/Main.cs

@@ -27,20 +27,14 @@
 */
 
 using System;
-using System.IO;
-using System.Text;
-using System.Timers;
-using System.Net;
-using System.Threading;
 using System.Reflection;
-using libsecondlife;
+using System.Threading;
-using OpenSim.Framework.Manager;
+using System.Timers;
-using OpenSim.Framework;
-using OpenSim.Framework.Sims;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.GenericConfig;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -156,7 +150,7 @@ namespace OpenSim.Grid.GridServer
 
             m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
 
-            System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.
+            Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates.
             simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
             simCheckTimer.Enabled = true;
         }

OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs

@@ -26,9 +26,7 @@
 * 
 */
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Grid/UserServer.Config/AssemblyInfo.cs

@@ -26,9 +26,7 @@
 * 
 */
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // Information about this assembly is defined by the following
 // attributes.
 //

OpenSim/Grid/UserServer.Config/DbUserConfig.cs

@@ -26,10 +26,9 @@
 * 
 */
 using System;
-using System.Collections.Generic;
+using Db4objects.Db4o;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using Db4objects.Db4o;
 
 namespace OpenUser.Config.UserConfigDb4o
 {
@@ -37,7 +36,7 @@ namespace OpenUser.Config.UserConfigDb4o
 	{
 		public UserConfig GetConfigObject()
 		{
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
+			MainLog.Instance.Verbose("Loading Db40Config dll");
 			return ( new DbUserConfig());
 		}
 	}
@@ -47,13 +46,13 @@ namespace OpenUser.Config.UserConfigDb4o
 		private IObjectContainer db;	
 		
 		public void LoadDefaults() {
-			OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+			MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
 			
-			this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
+			this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
 
-			this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
+			this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
-            		this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null");
+            		this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
-            		this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
+            		this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
 		}
 
 		public override void InitConfig() {
@@ -61,7 +60,7 @@ namespace OpenUser.Config.UserConfigDb4o
 				db = Db4oFactory.OpenFile("openuser.yap");
 				IObjectSet result = db.Get(typeof(DbUserConfig));
 				if(result.Count==1) {
-					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
+					MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
 					foreach (DbUserConfig cfg in result) {
 						this.GridServerURL=cfg.GridServerURL;
 						this.GridSendKey=cfg.GridSendKey;
@@ -69,22 +68,22 @@ namespace OpenUser.Config.UserConfigDb4o
 						this.DefaultStartupMsg=cfg.DefaultStartupMsg;
 					}
 				} else {
-					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+					MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
 					LoadDefaults();
-					OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database");
+					MainLog.Instance.Verbose("Writing out default settings to local database");
 					db.Set(this);
 					db.Close();
 				}
 			} catch(Exception e) {
-				OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+				MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+                MainLog.Instance.Warn(e.ToString());
 			}
 			
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:");
+			MainLog.Instance.Verbose("User settings loaded:");
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
+			MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
+			MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
+			MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
-			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
+			MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
 		}
 	
 

OpenSim/Grid/UserServer/Main.cs

@@ -27,18 +27,13 @@
 */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using System.IO;
-using System.Text;
 using libsecondlife;
-using OpenSim.Framework.User;
-using OpenSim.Framework.Sims;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
+using OpenSim.Framework.User;
 using OpenSim.Framework.Utilities;
 using OpenSim.GenericConfig;
 
@@ -73,7 +68,7 @@ namespace OpenSim.Grid.UserServer
         private OpenUser_Main()
         {
             m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
-            OpenSim.Framework.Console.MainLog.Instance = m_console;
+            MainLog.Instance = m_console;
         }
 
         private void Work()
@@ -93,16 +88,16 @@ namespace OpenSim.Grid.UserServer
             this.ConfigDB(this.localXMLConfig);
             this.localXMLConfig.Close();
 
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
+            MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
             Cfg = this.LoadConfigDll(this.ConfigDll);
             Cfg.InitConfig();
 
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
+            MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
             m_userManager = new UserManager();
             m_userManager._config = Cfg;
             m_userManager.AddPlugin(StorageDll);
 
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
+            MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(8002);
 
             httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);

OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs

@@ -1,7 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

OpenSim/Grid/UserServer/UserManager.cs

@@ -27,22 +27,11 @@
 */
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Data;
-using libsecondlife;
-using System.Reflection;
-
-using System.Xml;
 using Nwc.XmlRpc;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Sims;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-
 using OpenSim.Framework.UserManagement;
 
-using System.Security.Cryptography;
-
 namespace OpenSim.Grid.UserServer
 {
     public class UserManager : UserManagerBase

OpenSim/Region/Application/Application.cs

@@ -26,10 +26,8 @@
 * 
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework.Console;
-using OpenSim.Region.ClientStack;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim
 {
@@ -109,13 +107,13 @@ namespace OpenSim
             sim.m_sandbox = sandBoxMode;
             sim.user_accounts = userAccounts;
             sim.gridLocalAsset = gridLocalAsset;
-            OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+            ScenePresence.PhysicsEngineFlying = allowFlying;
 
             sim.StartUp();
 
             while (true)
             {
-                OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
+                MainLog.Instance.MainLogPrompt();
             }
         }
     }

OpenSim/Region/Application/OpenSimMain.cs

@@ -27,37 +27,23 @@
 */
 
 using System;
-using System.Text;
 using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
 using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Data;
-
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
 using OpenSim.Assets;
-using OpenSim.Region.Caches;
+using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Servers;
-using OpenSim.GenericConfig;
 using OpenSim.Framework.Communications;
-using OpenSim.Region.Communications.OGS1;
+using OpenSim.Framework.Console;
-using OpenSim.Region.Communications.Local;
+using OpenSim.Framework.Data;
-
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.GenericConfig;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
 using OpenSim.Region.ClientStack;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.Communications.OGS1;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim
 {
@@ -96,7 +82,7 @@ namespace OpenSim
             }
 
             m_log = new LogBase(m_logFilename, "Region", this, m_silent);
-            OpenSim.Framework.Console.MainLog.Instance = m_log;
+            MainLog.Instance = m_log;
 
             m_log.Verbose( "Main.cs:Startup() - Loading configuration");
             this.serversData.InitConfig(this.m_sandbox, this.localConfig);
@@ -121,7 +107,7 @@ namespace OpenSim
 
             startuptime = DateTime.Now;
 
-            this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
+            this.physManager = new PhysicsManager();
             this.physManager.LoadPlugins();
 
             this.SetupHttpListener();
@@ -187,12 +173,12 @@ namespace OpenSim
             RegionInfo regionDat = new RegionInfo();
             AuthenticateSessionsBase authenBase;
 
-            string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+            string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
             string[] configFiles = Directory.GetFiles(path, "*.xml");
 
             if (configFiles.Length == 0)
             {
-                string path2 = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+                string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
                 string path3 = Path.Combine(path2, "default.xml");
                 Console.WriteLine("Creating default region config file");
                 //TODO create default region
@@ -361,23 +347,23 @@ namespace OpenSim
                 case "":
                     this.m_physicsEngine = "basicphysics";
                     configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    ScenePresence.PhysicsEngineFlying = false;
                     break;
 
                 case "basicphysics":
                     this.m_physicsEngine = "basicphysics";
                     configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    ScenePresence.PhysicsEngineFlying = false;
                     break;
 
                 case "RealPhysX":
                     this.m_physicsEngine = "RealPhysX";
-                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    ScenePresence.PhysicsEngineFlying = true;
                     break;
 
                 case "OpenDynamicsEngine":
                     this.m_physicsEngine = "OpenDynamicsEngine";
-                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    ScenePresence.PhysicsEngineFlying = true;
                     break;
             }
 
@@ -459,7 +445,7 @@ namespace OpenSim
                     m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
                     break;
                 case "users":
-                    OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
+                    ScenePresence TempAv;
                     m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
                     /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
                      {

OpenSim/Region/Application/VersionInfo.cs

@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-
 namespace OpenSim
 {
     /// <summary>

OpenSim/Region/Caches/AssetCache.cs

@@ -28,13 +28,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Reflection;
+using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Region.Caches
 {
@@ -45,8 +44,8 @@ namespace OpenSim.Region.Caches
     /// </summary>
     public class AssetCache : IAssetReceiver
     {
-        public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets;
+        public Dictionary<LLUUID, AssetInfo> Assets;
-        public Dictionary<libsecondlife.LLUUID, TextureImage> Textures;
+        public Dictionary<LLUUID, TextureImage> Textures;
 
         public List<AssetRequest> AssetRequests = new List<AssetRequest>();  //assets ready to be sent to viewers
         public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
@@ -67,8 +66,8 @@ namespace OpenSim.Region.Caches
             Console.WriteLine("Creating Asset cache");
             _assetServer = assetServer;
             _assetServer.SetReceiver(this);
-            Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
+            Assets = new Dictionary<LLUUID, AssetInfo>();
-            Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>();
+            Textures = new Dictionary<LLUUID, TextureImage>();
             this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
             this._assetCacheThread.IsBackground = true;
             this._assetCacheThread.Start();
@@ -81,8 +80,8 @@ namespace OpenSim.Region.Caches
             _assetServer = this.LoadAssetDll(assetServerDLLName);
             _assetServer.SetServerInfo(assetServerURL, assetServerKey);
             _assetServer.SetReceiver(this);
-            Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
+            Assets = new Dictionary<LLUUID, AssetInfo>();
-            Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>();
+            Textures = new Dictionary<LLUUID, TextureImage>();
             this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
             this._assetCacheThread.IsBackground = true;
             this._assetCacheThread.Start();
@@ -216,7 +215,7 @@ namespace OpenSim.Region.Caches
         /// Event handler, called by a TextureSender object to say that texture has been sent
         /// </summary>
         /// <param name="sender"></param>
-        public void TextureSent(AssetCache.TextureSender sender)
+        public void TextureSent(TextureSender sender)
         {
             if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
             {