From 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 3 Jul 2007 14:37:29 +0000
Subject: * Optimized usings (the 'LL ate my scripts' commit) * added some
licensing info
---
.../Communications/CommunicationsManager.cs | 10 ++---
OpenSim/Framework/Communications/IGridServices.cs | 3 --
.../Communications/IInterRegionCommunications.cs | 7 +--
OpenSim/Framework/Communications/IUserServices.cs | 4 --
.../Communications/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/Console/AssemblyInfo.cs | 2 -
OpenSim/Framework/Console/ConsoleCallbacksBase.cs | 4 --
OpenSim/Framework/Console/LogBase.cs | 12 ++---
OpenSim/Framework/Console/MainLog.cs | 2 -
OpenSim/Framework/Data.DB4o/DB4oGridData.cs | 4 --
OpenSim/Framework/Data.DB4o/DB4oManager.cs | 2 -
OpenSim/Framework/Data.DB4o/DB4oUserData.cs | 3 --
.../Framework/Data.DB4o/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs | 22 +++++-----
OpenSim/Framework/Data.MSSQL/MSSQLManager.cs | 7 +--
.../Data.MSSQL/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/Data.MySQL/MySQLGridData.cs | 30 +++++++------
OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs | 22 +++++-----
OpenSim/Framework/Data.MySQL/MySQLLogData.cs | 2 -
OpenSim/Framework/Data.MySQL/MySQLManager.cs | 51 ++++++++++------------
OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 15 +++----
.../Data.MySQL/Properties/AssemblyInfo.cs | 2 -
.../Data.SQLite/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/Data.SQLite/SQLiteGridData.cs | 22 +++++-----
OpenSim/Framework/Data.SQLite/SQLiteManager.cs | 7 +--
OpenSim/Framework/Data/GridData.cs | 8 ++--
OpenSim/Framework/Data/ILogData.cs | 4 --
OpenSim/Framework/Data/IniConfig.cs | 4 --
OpenSim/Framework/Data/InventoryData.cs | 2 -
OpenSim/Framework/Data/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/Data/ReservationData.cs | 4 --
OpenSim/Framework/Data/SimProfileData.cs | 8 ++--
OpenSim/Framework/Data/UserData.cs | 3 --
OpenSim/Framework/Data/UserProfileData.cs | 2 -
OpenSim/Framework/General/AgentInventory.cs | 2 -
.../Framework/General/AuthenticateSessionBase.cs | 2 -
OpenSim/Framework/General/BlockingQueue.cs | 4 +-
OpenSim/Framework/General/IRegionCommsListener.cs | 5 +--
.../General/Interfaces/AuthenticateResponse.cs | 8 ----
.../General/Interfaces/Config/IGenericConfig.cs | 4 --
.../General/Interfaces/Config/IGridConfig.cs | 4 --
.../General/Interfaces/Config/IUserConfig.cs | 4 --
.../Framework/General/Interfaces/IAssetServer.cs | 5 ---
OpenSim/Framework/General/Interfaces/IClientAPI.cs | 5 +--
.../Framework/General/Interfaces/ILocalStorage.cs | 1 -
.../Framework/General/Interfaces/IUserServer.cs | 5 +--
OpenSim/Framework/General/Interfaces/IWorld.cs | 3 --
OpenSim/Framework/General/LoginService.cs | 7 ---
.../Framework/General/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/General/RegionCommsListener.cs | 6 +--
OpenSim/Framework/General/Remoting.cs | 3 +-
OpenSim/Framework/General/SimProfile.cs | 3 --
OpenSim/Framework/General/Types/AgentCiruitData.cs | 3 --
OpenSim/Framework/General/Types/AgentWearable.cs | 3 --
OpenSim/Framework/General/Types/AssetBase.cs | 3 --
OpenSim/Framework/General/Types/AssetLandmark.cs | 4 +-
OpenSim/Framework/General/Types/AssetStorage.cs | 3 --
OpenSim/Framework/General/Types/EstateSettings.cs | 8 +---
OpenSim/Framework/General/Types/Login.cs | 3 --
OpenSim/Framework/General/Types/MapBlockData.cs | 2 -
OpenSim/Framework/General/Types/NeighbourInfo.cs | 8 ----
.../Framework/General/Types/NetworkServersInfo.cs | 29 ++++++------
OpenSim/Framework/General/Types/ParcelData.cs | 9 ++--
OpenSim/Framework/General/Types/PrimData.cs | 2 -
.../Framework/General/Types/PrimitiveBaseShape.cs | 5 ---
OpenSim/Framework/General/Types/RegionHandle.cs | 2 -
OpenSim/Framework/General/Types/RegionInfo.cs | 41 +++++++++--------
OpenSim/Framework/General/Types/UUID.cs | 2 -
OpenSim/Framework/General/UserProfile.cs | 4 +-
OpenSim/Framework/General/Util.cs | 2 -
.../GenericConfig/Xml/Properties/AssemblyInfo.cs | 2 -
OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs | 5 +--
OpenSim/Framework/Servers/BaseHttpServer.cs | 19 ++++----
OpenSim/Framework/Servers/CheckSumServer.cs | 15 -------
OpenSim/Framework/Servers/ILlsdMethodHandler.cs | 30 +++++++++++--
OpenSim/Framework/Servers/LlsdMethod.cs | 30 +++++++++++--
OpenSim/Framework/Servers/RestMethod.cs | 4 --
OpenSim/Framework/Servers/UDPServerBase.cs | 8 ----
OpenSim/Framework/Servers/XmlRpcMethod.cs | 1 -
OpenSim/Framework/UserManager/LoginResponse.cs | 13 ++----
OpenSim/Framework/UserManager/UserManagerBase.cs | 37 ++++++++--------
81 files changed, 237 insertions(+), 411 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 48ff40e..f90e766 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/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)
{
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index a4812fb..c168c20 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/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
{
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 7b0d340..55f12ac 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -25,17 +25,14 @@
* 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;
-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);
}
}
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index 37f4942..0b1f86c 100644
--- a/OpenSim/Framework/Communications/IUserServices.cs
+++ b/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
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index 83e7dd4..09f6473 100644
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 8f715d2..30f6167 100644
--- a/OpenSim/Framework/Console/AssemblyInfo.cs
+++ b/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.
//
diff --git a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
index e3847be..346cfe6 100644
--- a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
+++ b/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
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index a4a17e9..f73e15e 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/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;
diff --git a/OpenSim/Framework/Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs
index d7f945e..7d52622 100644
--- a/OpenSim/Framework/Console/MainLog.cs
+++ b/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 {
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index dc8488e..1aaa775 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/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>
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index bd4cea8..0df6350 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/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
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 3ab0073..2e33ab0 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/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
diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index 68395a1..905cd9b 100644
--- a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 5bdceaf..ca9196a5 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
+ 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();
- System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+ SHA512Managed HashProvider = new SHA512Managed();
+ ASCIIEncoding TextProvider = new ASCIIEncoding();
byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 3c83c1f..49bf31c 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/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 OpenSim.Framework.Data;
+using libsecondlife;
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"];
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
index af310e8..066c739 100644
--- a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 43e3054..ef643d2 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
+ 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();
- System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+ SHA512Managed HashProvider = new SHA512Managed();
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
+ IDataReader reader = result.ExecuteReader();
ReservationData row = database.readReservationRow(reader);
reader.Close();
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 434df1a..790759a 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
+ IDataReader reader = result.ExecuteReader();
List<InventoryFolderBase> items = database.readInventoryFolders(reader);
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 8265614..66f3399 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -26,8 +26,6 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
namespace OpenSim.Framework.Data.MySQL
{
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index b2f398b..ab478ed 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -27,17 +27,10 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
using System.Data;
-
-// MySQL Native
-using MySql;
-using MySql.Data;
-using MySql.Data.Types;
+using libsecondlife;
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.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]);
- retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]);
+ retval.UUID = new LLUUID((string)reader["UUID"]);
+ retval.sessionID = new LLUUID((string)reader["sessionID"]);
+ 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.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]);
+ retval.profileImage = new LLUUID((string)reader["profileImage"]);
+ 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.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
- folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]);
+ folder.agentID = new LLUUID((string)reader["agentID"]);
+ folder.parentID = new LLUUID((string)reader["parentFolderID"]);
+ 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.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]);
+ item.assetID = new LLUUID((string)reader["assetID"]);
+ 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);
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 0304452..c116536 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -27,8 +27,7 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Data;
+using System.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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
+ IDataReader reader = result.ExecuteReader();
UserAgentData row = database.readAgentRow(reader);
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index d67ccf6..52d6a54 100644
--- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index f811825..9de5edb 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index 800e26c..511c5f0 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
+ 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);
- System.Data.IDataReader reader = result.ExecuteReader();
+ IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
+ 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();
- System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+ SHA512Managed HashProvider = new SHA512Managed();
+ ASCIIEncoding TextProvider = new ASCIIEncoding();
byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 3397e0d..c9931ab 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/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 OpenSim.Framework.Data;
+using libsecondlife;
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"];
diff --git a/OpenSim/Framework/Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
index 7f8fdaf..5a17d20 100644
--- a/OpenSim/Framework/Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.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
{
@@ -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
diff --git a/OpenSim/Framework/Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs
index ccb3b84..059fef5 100644
--- a/OpenSim/Framework/Data/ILogData.cs
+++ b/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>
diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
index 2f002c1..2b52fd1 100644
--- a/OpenSim/Framework/Data/IniConfig.cs
+++ b/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
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index 8a3a664..c2a1d06 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/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
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 7d749d5..f9260a1 100644
--- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index f404ebd..0078df0 100644
--- a/OpenSim/Framework/Data/ReservationData.cs
+++ b/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
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index 201aa01..3dddfb4 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.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
{
@@ -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");
}
}
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
index 2e15b47..c65f9fd 100644
--- a/OpenSim/Framework/Data/UserData.cs
+++ b/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
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
index ac168e0..bb7d48c 100644
--- a/OpenSim/Framework/Data/UserProfileData.cs
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -26,8 +26,6 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
using libsecondlife;
namespace OpenSim.Framework.Data
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index fbf4d23..e45a0cd 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/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;
diff --git a/OpenSim/Framework/General/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
index 73dd3e2..71616e3 100644
--- a/OpenSim/Framework/General/AuthenticateSessionBase.cs
+++ b/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;
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
index 667b8d8..0cc8124 100644
--- a/OpenSim/Framework/General/BlockingQueue.cs
+++ b/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
{
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 0e80941..32444f9 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/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
{
diff --git a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
index 462e2c5..508485b 100644
--- a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
index 13980fe..2c379dd 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
index 0fafe1a..81dc293 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
index 2f4b340..ae6cedb 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index 826392d..ab60dd7 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs
+++ b/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;
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index d62247c..b5a0a0b 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/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 OpenSim.Framework.Inventory;
+using System.Net;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Types;
-using System.Net;
namespace OpenSim.Framework.Interfaces
{
diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index 4987d10..dbdb25d 100644
--- a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
@@ -26,7 +26,6 @@
*
*/
-using System;
using libsecondlife;
using OpenSim.Framework.Types;
diff --git a/OpenSim/Framework/General/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
index c6e2223..b3700d2 100644
--- a/OpenSim/Framework/General/Interfaces/IUserServer.cs
+++ b/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
{
diff --git a/OpenSim/Framework/General/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
index 2edc0b4..204c01b 100644
--- a/OpenSim/Framework/General/Interfaces/IWorld.cs
+++ b/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;
diff --git a/OpenSim/Framework/General/LoginService.cs b/OpenSim/Framework/General/LoginService.cs
index f14754f..02efcec 100644
--- a/OpenSim/Framework/General/LoginService.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
index 86f5cdb..004040b 100644
--- a/OpenSim/Framework/General/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index 5fa2f58..2b0bc62 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.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;
@@ -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)
{
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
index e6fdf70..df32db2 100644
--- a/OpenSim/Framework/General/Remoting.cs
+++ b/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
{
diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
index cfa5e50..47f1af3 100644
--- a/OpenSim/Framework/General/SimProfile.cs
+++ b/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;
diff --git a/OpenSim/Framework/General/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
index a650343..00e9d0a 100644
--- a/OpenSim/Framework/General/Types/AgentCiruitData.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 4c93da7..6152b7d 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index 86586a6..c203f51 100644
--- a/OpenSim/Framework/General/Types/AssetBase.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
index 8a10b70..8aa872e 100644
--- a/OpenSim/Framework/General/Types/AssetLandmark.cs
+++ b/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);
diff --git a/OpenSim/Framework/General/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
index 8cac23a..3681336 100644
--- a/OpenSim/Framework/General/Types/AssetStorage.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 778c893..436b109 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/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 libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
+ public Simulator.RegionFlags regionFlags = Simulator.RegionFlags.None; //Booleam values of various region settings
+ public Simulator.SimAccess simAccess = Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
public float sunHour = 0;
public float terrainRaiseLimit = 0;
diff --git a/OpenSim/Framework/General/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index 3180a16..d54c019 100644
--- a/OpenSim/Framework/General/Types/Login.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
index 2e6f56e..fbb3b73 100644
--- a/OpenSim/Framework/General/Types/MapBlockData.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
index 310fd1c..bb67981 100644
--- a/OpenSim/Framework/General/Types/NeighbourInfo.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index c6b81a7..89ebf94 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -26,8 +26,7 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
+using OpenSim.Framework.Console;
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");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
}
}
diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 40f128a..761d55e 100644
--- a/OpenSim/Framework/General/Types/ParcelData.cs
+++ b/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 libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
+ public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.None;
+ public Parcel.ParcelFlags parcelFlags = Parcel.ParcelFlags.None;
public byte landingType = 0;
public byte mediaAutoScale = 0;
public LLUUID mediaID = LLUUID.Zero;
diff --git a/OpenSim/Framework/General/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
index f84ae3e..ff81bcd 100644
--- a/OpenSim/Framework/General/Types/PrimData.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 584bc9b..1357e06 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/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
{
diff --git a/OpenSim/Framework/General/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 1271d04..409b05a 100644
--- a/OpenSim/Framework/General/Types/RegionHandle.cs
+++ b/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
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 7b99d06..4602dcf 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/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");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
- OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName);
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
+ MainLog.Instance.Verbose("Sim settings loaded:");
+ MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
+ MainLog.Instance.Verbose("Name: " + this.RegionName);
+ MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
+ MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
+ MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
+ MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
}
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs
index bb9206f..9cde18e 100644
--- a/OpenSim/Framework/General/Types/UUID.cs
+++ b/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
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 263dba2..243208a 100644
--- a/OpenSim/Framework/General/UserProfile.cs
+++ b/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
{
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index 8c34c9b..13e3af2 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/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
{
diff --git a/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
index de5f48d..fcffd67 100644
--- a/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ b/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.
diff --git a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
index c526aec..7fa085d 100644
--- a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
@@ -26,8 +26,7 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
+using System.IO;
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;
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 5dc1f56..713793c 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/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;
- System.Text.Encoding encoding = System.Text.Encoding.UTF8;
- System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+ Stream body = request.InputStream;
+ Encoding encoding = Encoding.UTF8;
+ 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);
- System.IO.Stream output = response.OutputStream;
+ byte[] buffer = Encoding.UTF8.GetBytes(responseString);
+ 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);
}
}
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index 6aeb58c..104de94 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/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
diff --git a/OpenSim/Framework/Servers/ILlsdMethodHandler.cs b/OpenSim/Framework/Servers/ILlsdMethodHandler.cs
index f5daa8d..5382f2d 100644
--- a/OpenSim/Framework/Servers/ILlsdMethodHandler.cs
+++ b/OpenSim/Framework/Servers/ILlsdMethodHandler.cs
@@ -1,6 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
namespace OpenSim.Framework.Servers
{
diff --git a/OpenSim/Framework/Servers/LlsdMethod.cs b/OpenSim/Framework/Servers/LlsdMethod.cs
index bf58a71..d17fa38 100644
--- a/OpenSim/Framework/Servers/LlsdMethod.cs
+++ b/OpenSim/Framework/Servers/LlsdMethod.cs
@@ -1,6 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
namespace OpenSim.Framework.Servers
{
diff --git a/OpenSim/Framework/Servers/RestMethod.cs b/OpenSim/Framework/Servers/RestMethod.cs
index a2b6bf0..c6cb230 100644
--- a/OpenSim/Framework/Servers/RestMethod.cs
+++ b/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 );
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index 2617c56..508eb9d 100644
--- a/OpenSim/Framework/Servers/UDPServerBase.cs
+++ b/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
diff --git a/OpenSim/Framework/Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
index 51b3303..b76ac51 100644
--- a/OpenSim/Framework/Servers/XmlRpcMethod.cs
+++ b/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
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index d1cd8cf..64504fa 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/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(
- OpenSim.Framework.Console.LogPriority.LOW,
+ MainLog.Instance.WriteLine(
+ LogPriority.LOW,
"LoginResponse: Error creating XML-RPC Response: " + e.Message
);
return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 560752e..f316cc7 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/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.Xml;
+using System.Security.Cryptography;
+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() + ")");
}
}
}
--
cgit v1.1