aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs10
-rw-r--r--OpenSim/Framework/Communications/IGridServices.cs3
-rw-r--r--OpenSim/Framework/Communications/IInterRegionCommunications.cs7
-rw-r--r--OpenSim/Framework/Communications/IUserServices.cs4
-rw-r--r--OpenSim/Framework/Communications/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Console/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Console/ConsoleCallbacksBase.cs4
-rw-r--r--OpenSim/Framework/Console/LogBase.cs12
-rw-r--r--OpenSim/Framework/Console/MainLog.cs2
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oGridData.cs4
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oManager.cs2
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oUserData.cs3
-rw-r--r--OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs22
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs7
-rw-r--r--OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs30
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs22
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs51
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs15
-rw-r--r--OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteGridData.cs22
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteManager.cs7
-rw-r--r--OpenSim/Framework/Data/GridData.cs8
-rw-r--r--OpenSim/Framework/Data/ILogData.cs4
-rw-r--r--OpenSim/Framework/Data/IniConfig.cs4
-rw-r--r--OpenSim/Framework/Data/InventoryData.cs2
-rw-r--r--OpenSim/Framework/Data/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data/ReservationData.cs4
-rw-r--r--OpenSim/Framework/Data/SimProfileData.cs8
-rw-r--r--OpenSim/Framework/Data/UserData.cs3
-rw-r--r--OpenSim/Framework/Data/UserProfileData.cs2
-rw-r--r--OpenSim/Framework/General/AgentInventory.cs2
-rw-r--r--OpenSim/Framework/General/AuthenticateSessionBase.cs2
-rw-r--r--OpenSim/Framework/General/BlockingQueue.cs4
-rw-r--r--OpenSim/Framework/General/IRegionCommsListener.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs8
-rw-r--r--OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/IAssetServer.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/ILocalStorage.cs1
-rw-r--r--OpenSim/Framework/General/Interfaces/IUserServer.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/IWorld.cs3
-rw-r--r--OpenSim/Framework/General/LoginService.cs7
-rw-r--r--OpenSim/Framework/General/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/General/RegionCommsListener.cs6
-rw-r--r--OpenSim/Framework/General/Remoting.cs3
-rw-r--r--OpenSim/Framework/General/SimProfile.cs3
-rw-r--r--OpenSim/Framework/General/Types/AgentCiruitData.cs3
-rw-r--r--OpenSim/Framework/General/Types/AgentWearable.cs3
-rw-r--r--OpenSim/Framework/General/Types/AssetBase.cs3
-rw-r--r--OpenSim/Framework/General/Types/AssetLandmark.cs4
-rw-r--r--OpenSim/Framework/General/Types/AssetStorage.cs3
-rw-r--r--OpenSim/Framework/General/Types/EstateSettings.cs8
-rw-r--r--OpenSim/Framework/General/Types/Login.cs3
-rw-r--r--OpenSim/Framework/General/Types/MapBlockData.cs2
-rw-r--r--OpenSim/Framework/General/Types/NeighbourInfo.cs8
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs29
-rw-r--r--OpenSim/Framework/General/Types/ParcelData.cs9
-rw-r--r--OpenSim/Framework/General/Types/PrimData.cs2
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs5
-rw-r--r--OpenSim/Framework/General/Types/RegionHandle.cs2
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs41
-rw-r--r--OpenSim/Framework/General/Types/UUID.cs2
-rw-r--r--OpenSim/Framework/General/UserProfile.cs4
-rw-r--r--OpenSim/Framework/General/Util.cs2
-rw-r--r--OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs5
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs19
-rw-r--r--OpenSim/Framework/Servers/CheckSumServer.cs15
-rw-r--r--OpenSim/Framework/Servers/ILlsdMethodHandler.cs30
-rw-r--r--OpenSim/Framework/Servers/LlsdMethod.cs30
-rw-r--r--OpenSim/Framework/Servers/RestMethod.cs4
-rw-r--r--OpenSim/Framework/Servers/UDPServerBase.cs8
-rw-r--r--OpenSim/Framework/Servers/XmlRpcMethod.cs1
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs13
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs37
81 files changed, 237 insertions, 411 deletions
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text; 28using System.Text;
32using OpenSim.Framework; 29using libsecondlife;
30using libsecondlife.Packets;
33using OpenSim.Framework.Data; 31using OpenSim.Framework.Data;
34using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
36using libsecondlife;
37using libsecondlife.Packets;
38 34
39namespace OpenSim.Framework.Communications 35namespace OpenSim.Framework.Communications
40{ 36{
@@ -54,7 +50,7 @@ namespace OpenSim.Framework.Communications
54 #region Packet Handlers 50 #region Packet Handlers
55 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 51 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
56 { 52 {
57 System.Text.Encoding enc = System.Text.Encoding.ASCII; 53 Encoding enc = Encoding.ASCII;
58 UserProfileData profileData = this.UserServer.GetUserProfile(uuid); 54 UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
59 if (profileData != null) 55 if (profileData != null)
60 { 56 {
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 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
33using OpenSim.Framework;
34 31
35namespace OpenSim.Framework.Communications 32namespace OpenSim.Framework.Communications
36{ 33{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
32using OpenSim.Framework;
33 30
34namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
35{ 32{
36 public interface IInterRegionCommunications 33 public interface IInterRegionCommunications
37 { 34 {
38 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); 35 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
39 bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 36 bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
40 } 37 }
41} 38}
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32
33using OpenSim.Framework.Data; 29using OpenSim.Framework.Data;
34 30
35namespace OpenSim.Framework.Communications 31namespace 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// General Information about an assembly is controlled through the following 30// General Information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 31// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 32// 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework.Console 28namespace OpenSim.Framework.Console
33{ 29{
34 public interface conscmd_callback 30 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
120 return; 120 return;
121 } 121 }
122 122
123 private void WriteNewLine(System.ConsoleColor color, string format, params object[] args) 123 private void WriteNewLine(ConsoleColor color, string format, params object[] args)
124 { 124 {
125 Log.WriteLine(format, args); 125 Log.WriteLine(format, args);
126 Log.Flush(); 126 Log.Flush();
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console
132 System.Console.WriteLine(format, args); 132 System.Console.WriteLine(format, args);
133 System.Console.ResetColor(); 133 System.Console.ResetColor();
134 } 134 }
135 catch (System.ArgumentNullException) 135 catch (ArgumentNullException)
136 { 136 {
137 // Some older systems dont support coloured text. 137 // Some older systems dont support coloured text.
138 System.Console.WriteLine(format, args); 138 System.Console.WriteLine(format, args);
@@ -162,14 +162,14 @@ namespace OpenSim.Framework.Console
162 162
163 while (true) 163 while (true)
164 { 164 {
165 addressStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue); 165 addressStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
166 if (IPAddress.TryParse(addressStr, out address)) 166 if (IPAddress.TryParse(addressStr, out address))
167 { 167 {
168 break; 168 break;
169 } 169 }
170 else 170 else
171 { 171 {
172 OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter."); 172 MainLog.Instance.Error("Illegal address. Please re-enter.");
173 } 173 }
174 } 174 }
175 175
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
183 183
184 while (true) 184 while (true)
185 { 185 {
186 portStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue); 186 portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
187 if (int.TryParse(portStr, out port)) 187 if (int.TryParse(portStr, out port))
188 { 188 {
189 if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort) 189 if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort)
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Console
192 } 192 }
193 } 193 }
194 194
195 OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter."); 195 MainLog.Instance.Error("Illegal address. Please re-enter.");
196 } 196 }
197 197
198 return port; 198 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29
30namespace OpenSim.Framework.Console 28namespace OpenSim.Framework.Console
31{ 29{
32 public class MainLog { 30 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 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Data;
33using libsecondlife; 30using libsecondlife;
34 31
35
36namespace OpenSim.Framework.Data.DB4o 32namespace OpenSim.Framework.Data.DB4o
37{ 33{
38 /// <summary> 34 /// <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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using Db4objects.Db4o; 30using Db4objects.Db4o;
32using OpenSim.Framework.Data;
33using libsecondlife; 31using libsecondlife;
34 32
35namespace OpenSim.Framework.Data.DB4o 33namespace 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Data;
32using libsecondlife; 29using libsecondlife;
33 30
34namespace OpenSim.Framework.Data.DB4o 31namespace 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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.MSSQL 35namespace OpenSim.Framework.Data.MSSQL
34{ 36{
@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.MSSQL
99 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
100 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
101 103
102 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); 104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
103 System.Data.IDataReader reader = result.ExecuteReader(); 105 IDataReader reader = result.ExecuteReader();
104 106
105 SimProfileData row = database.getRow(reader); 107 SimProfileData row = database.getRow(reader);
106 reader.Close(); 108 reader.Close();
@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.MSSQL
114 /// </summary> 116 /// </summary>
115 /// <param name="uuid">The region UUID</param> 117 /// <param name="uuid">The region UUID</param>
116 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
117 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 119 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
118 { 120 {
119 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
120 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToStringHyphenated();
121 123
122 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
123 System.Data.IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
124 126
125 SimProfileData row = database.getRow(reader); 127 SimProfileData row = database.getRow(reader);
126 reader.Close(); 128 reader.Close();
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.MSSQL
153 /// <param name="handle">The attempted regionHandle of the challenger</param> 155 /// <param name="handle">The attempted regionHandle of the challenger</param>
154 /// <param name="authkey">The secret</param> 156 /// <param name="authkey">The secret</param>
155 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 157 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
156 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 158 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
157 { 159 {
158 bool throwHissyFit = false; // Should be true by 1.0 160 bool throwHissyFit = false; // Should be true by 1.0
159 161
@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.MSSQL
174 /// <param name="authhash"></param> 176 /// <param name="authhash"></param>
175 /// <param name="challenge"></param> 177 /// <param name="challenge"></param>
176 /// <returns></returns> 178 /// <returns></returns>
177 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 179 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
178 { 180 {
179 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 181 SHA512Managed HashProvider = new SHA512Managed();
180 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 182 ASCIIEncoding TextProvider = new ASCIIEncoding();
181 183
182 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 184 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
183 byte[] hash = HashProvider.ComputeHash(stream); 185 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32
33using System.Data.SqlClient; 31using System.Data.SqlClient;
34 32using libsecondlife;
35using OpenSim.Framework.Data;
36 33
37namespace OpenSim.Framework.Data.MSSQL 34namespace OpenSim.Framework.Data.MSSQL
38{ 35{
@@ -110,7 +107,7 @@ namespace OpenSim.Framework.Data.MSSQL
110 // Region Main 107 // Region Main
111 regionprofile.regionHandle = (ulong)reader["regionHandle"]; 108 regionprofile.regionHandle = (ulong)reader["regionHandle"];
112 regionprofile.regionName = (string)reader["regionName"]; 109 regionprofile.regionName = (string)reader["regionName"];
113 regionprofile.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 110 regionprofile.UUID = new LLUUID((string)reader["uuid"]);
114 111
115 // Secrets 112 // Secrets
116 regionprofile.regionRecvKey = (string)reader["regionRecvKey"]; 113 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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.MySQL 35namespace OpenSim.Framework.Data.MySQL
34{ 36{
@@ -104,8 +106,8 @@ namespace OpenSim.Framework.Data.MySQL
104 param["?xmax"] = xmax.ToString(); 106 param["?xmax"] = xmax.ToString();
105 param["?ymax"] = ymax.ToString(); 107 param["?ymax"] = ymax.ToString();
106 108
107 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param); 109 IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
108 System.Data.IDataReader reader = result.ExecuteReader(); 110 IDataReader reader = result.ExecuteReader();
109 111
110 SimProfileData row; 112 SimProfileData row;
111 113
@@ -144,8 +146,8 @@ namespace OpenSim.Framework.Data.MySQL
144 Dictionary<string, string> param = new Dictionary<string, string>(); 146 Dictionary<string, string> param = new Dictionary<string, string>();
145 param["?handle"] = handle.ToString(); 147 param["?handle"] = handle.ToString();
146 148
147 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param); 149 IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
148 System.Data.IDataReader reader = result.ExecuteReader(); 150 IDataReader reader = result.ExecuteReader();
149 151
150 SimProfileData row = database.readSimRow(reader); 152 SimProfileData row = database.readSimRow(reader);
151 reader.Close(); 153 reader.Close();
@@ -167,7 +169,7 @@ namespace OpenSim.Framework.Data.MySQL
167 /// </summary> 169 /// </summary>
168 /// <param name="uuid">The region UUID</param> 170 /// <param name="uuid">The region UUID</param>
169 /// <returns>The sim profile</returns> 171 /// <returns>The sim profile</returns>
170 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 172 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
171 { 173 {
172 try 174 try
173 { 175 {
@@ -176,8 +178,8 @@ namespace OpenSim.Framework.Data.MySQL
176 Dictionary<string, string> param = new Dictionary<string, string>(); 178 Dictionary<string, string> param = new Dictionary<string, string>();
177 param["?uuid"] = uuid.ToStringHyphenated(); 179 param["?uuid"] = uuid.ToStringHyphenated();
178 180
179 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 181 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
180 System.Data.IDataReader reader = result.ExecuteReader(); 182 IDataReader reader = result.ExecuteReader();
181 183
182 SimProfileData row = database.readSimRow(reader); 184 SimProfileData row = database.readSimRow(reader);
183 reader.Close(); 185 reader.Close();
@@ -221,7 +223,7 @@ namespace OpenSim.Framework.Data.MySQL
221 /// <param name="handle">The attempted regionHandle of the challenger</param> 223 /// <param name="handle">The attempted regionHandle of the challenger</param>
222 /// <param name="authkey">The secret</param> 224 /// <param name="authkey">The secret</param>
223 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 225 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
224 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 226 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
225 { 227 {
226 bool throwHissyFit = false; // Should be true by 1.0 228 bool throwHissyFit = false; // Should be true by 1.0
227 229
@@ -242,10 +244,10 @@ namespace OpenSim.Framework.Data.MySQL
242 /// <param name="authhash"></param> 244 /// <param name="authhash"></param>
243 /// <param name="challenge"></param> 245 /// <param name="challenge"></param>
244 /// <returns></returns> 246 /// <returns></returns>
245 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 247 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
246 { 248 {
247 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 249 SHA512Managed HashProvider = new SHA512Managed();
248 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 250 ASCIIEncoding TextProvider = new ASCIIEncoding();
249 251
250 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 252 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
251 byte[] hash = HashProvider.ComputeHash(stream); 253 byte[] hash = HashProvider.ComputeHash(stream);
@@ -262,8 +264,8 @@ namespace OpenSim.Framework.Data.MySQL
262 Dictionary<string, string> param = new Dictionary<string, string>(); 264 Dictionary<string, string> param = new Dictionary<string, string>();
263 param["?x"] = x.ToString(); 265 param["?x"] = x.ToString();
264 param["?y"] = y.ToString(); 266 param["?y"] = y.ToString();
265 System.Data.IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param); 267 IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
266 System.Data.IDataReader reader = result.ExecuteReader(); 268 IDataReader reader = result.ExecuteReader();
267 269
268 ReservationData row = database.readReservationRow(reader); 270 ReservationData row = database.readReservationRow(reader);
269 reader.Close(); 271 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Data;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Framework.Data.MySQL 33namespace OpenSim.Framework.Data.MySQL
@@ -98,8 +98,8 @@ namespace OpenSim.Framework.Data.MySQL
98 Dictionary<string, string> param = new Dictionary<string, string>(); 98 Dictionary<string, string> param = new Dictionary<string, string>();
99 param["?uuid"] = folderID.ToStringHyphenated(); 99 param["?uuid"] = folderID.ToStringHyphenated();
100 100
101 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param); 101 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
102 System.Data.IDataReader reader = result.ExecuteReader(); 102 IDataReader reader = result.ExecuteReader();
103 103
104 List<InventoryItemBase> items = database.readInventoryItems(reader); 104 List<InventoryItemBase> items = database.readInventoryItems(reader);
105 105
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.Data.MySQL
132 param["?uuid"] = user.ToStringHyphenated(); 132 param["?uuid"] = user.ToStringHyphenated();
133 param["?zero"] = LLUUID.Zero.ToStringHyphenated(); 133 param["?zero"] = LLUUID.Zero.ToStringHyphenated();
134 134
135 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param); 135 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
136 System.Data.IDataReader reader = result.ExecuteReader(); 136 IDataReader reader = result.ExecuteReader();
137 137
138 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 138 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
139 139
@@ -165,8 +165,8 @@ namespace OpenSim.Framework.Data.MySQL
165 Dictionary<string, string> param = new Dictionary<string, string>(); 165 Dictionary<string, string> param = new Dictionary<string, string>();
166 param["?uuid"] = parentID.ToStringHyphenated(); 166 param["?uuid"] = parentID.ToStringHyphenated();
167 167
168 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param); 168 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
169 System.Data.IDataReader reader = result.ExecuteReader(); 169 IDataReader reader = result.ExecuteReader();
170 170
171 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 171 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
172 172
@@ -198,8 +198,8 @@ namespace OpenSim.Framework.Data.MySQL
198 Dictionary<string, string> param = new Dictionary<string, string>(); 198 Dictionary<string, string> param = new Dictionary<string, string>();
199 param["?uuid"] = item.ToStringHyphenated(); 199 param["?uuid"] = item.ToStringHyphenated();
200 200
201 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param); 201 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
202 System.Data.IDataReader reader = result.ExecuteReader(); 202 IDataReader reader = result.ExecuteReader();
203 203
204 List<InventoryItemBase> items = database.readInventoryItems(reader); 204 List<InventoryItemBase> items = database.readInventoryItems(reader);
205 205
@@ -238,8 +238,8 @@ namespace OpenSim.Framework.Data.MySQL
238 Dictionary<string, string> param = new Dictionary<string, string>(); 238 Dictionary<string, string> param = new Dictionary<string, string>();
239 param["?uuid"] = folder.ToStringHyphenated(); 239 param["?uuid"] = folder.ToStringHyphenated();
240 240
241 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param); 241 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
242 System.Data.IDataReader reader = result.ExecuteReader(); 242 IDataReader reader = result.ExecuteReader();
243 243
244 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 244 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
245 245
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data.MySQL 30namespace OpenSim.Framework.Data.MySQL
33{ 31{
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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32 31using libsecondlife;
33// MySQL Native
34using MySql;
35using MySql.Data;
36using MySql.Data.Types;
37using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
38 33
39using OpenSim.Framework.Data;
40
41namespace OpenSim.Framework.Data.MySQL 34namespace OpenSim.Framework.Data.MySQL
42{ 35{
43 /// <summary> 36 /// <summary>
@@ -71,7 +64,7 @@ namespace OpenSim.Framework.Data.MySQL
71 64
72 dbcon.Open(); 65 dbcon.Open();
73 66
74 System.Console.WriteLine("MySQL connection established"); 67 Console.WriteLine("MySQL connection established");
75 } 68 }
76 catch (Exception e) 69 catch (Exception e)
77 { 70 {
@@ -187,7 +180,7 @@ namespace OpenSim.Framework.Data.MySQL
187 // Region Main 180 // Region Main
188 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString()); 181 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
189 retval.regionName = (string)reader["regionName"]; 182 retval.regionName = (string)reader["regionName"];
190 retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 183 retval.UUID = new LLUUID((string)reader["uuid"]);
191 184
192 // Secrets 185 // Secrets
193 retval.regionRecvKey = (string)reader["regionRecvKey"]; 186 retval.regionRecvKey = (string)reader["regionRecvKey"];
@@ -226,11 +219,11 @@ namespace OpenSim.Framework.Data.MySQL
226 string tempRegionMap = reader["regionMapTexture"].ToString(); 219 string tempRegionMap = reader["regionMapTexture"].ToString();
227 if (tempRegionMap != "") 220 if (tempRegionMap != "")
228 { 221 {
229 retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap); 222 retval.regionMapTextureID = new LLUUID(tempRegionMap);
230 } 223 }
231 else 224 else
232 { 225 {
233 retval.regionMapTextureID = new libsecondlife.LLUUID(); 226 retval.regionMapTextureID = new LLUUID();
234 } 227 }
235 } 228 }
236 else 229 else
@@ -259,7 +252,7 @@ namespace OpenSim.Framework.Data.MySQL
259 retval.reservationMinY = (int)reader["resYMin"]; 252 retval.reservationMinY = (int)reader["resYMin"];
260 retval.reservationName = (string)reader["resName"]; 253 retval.reservationName = (string)reader["resName"];
261 retval.status = (bool)reader["status"]; 254 retval.status = (bool)reader["status"];
262 retval.userUUID = new libsecondlife.LLUUID((string)reader["userUUID"]); 255 retval.userUUID = new LLUUID((string)reader["userUUID"]);
263 256
264 } 257 }
265 else 258 else
@@ -280,9 +273,9 @@ namespace OpenSim.Framework.Data.MySQL
280 if (reader.Read()) 273 if (reader.Read())
281 { 274 {
282 // Agent IDs 275 // Agent IDs
283 retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]); 276 retval.UUID = new LLUUID((string)reader["UUID"]);
284 retval.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]); 277 retval.sessionID = new LLUUID((string)reader["sessionID"]);
285 retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]); 278 retval.secureSessionID = new LLUUID((string)reader["secureSessionID"]);
286 279
287 // Agent Who? 280 // Agent Who?
288 retval.agentIP = (string)reader["agentIP"]; 281 retval.agentIP = (string)reader["agentIP"];
@@ -296,7 +289,7 @@ namespace OpenSim.Framework.Data.MySQL
296 // Current position 289 // Current position
297 retval.currentRegion = (string)reader["currentRegion"]; 290 retval.currentRegion = (string)reader["currentRegion"];
298 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString()); 291 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
299 libsecondlife.LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); 292 LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
300 } 293 }
301 else 294 else
302 { 295 {
@@ -316,7 +309,7 @@ namespace OpenSim.Framework.Data.MySQL
316 309
317 if (reader.Read()) 310 if (reader.Read())
318 { 311 {
319 retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]); 312 retval.UUID = new LLUUID((string)reader["UUID"]);
320 retval.username = (string)reader["username"]; 313 retval.username = (string)reader["username"];
321 retval.surname = (string)reader["lastname"]; 314 retval.surname = (string)reader["lastname"];
322 315
@@ -324,11 +317,11 @@ namespace OpenSim.Framework.Data.MySQL
324 retval.passwordSalt = (string)reader["passwordSalt"]; 317 retval.passwordSalt = (string)reader["passwordSalt"];
325 318
326 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 319 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
327 retval.homeLocation = new libsecondlife.LLVector3( 320 retval.homeLocation = new LLVector3(
328 Convert.ToSingle(reader["homeLocationX"].ToString()), 321 Convert.ToSingle(reader["homeLocationX"].ToString()),
329 Convert.ToSingle(reader["homeLocationY"].ToString()), 322 Convert.ToSingle(reader["homeLocationY"].ToString()),
330 Convert.ToSingle(reader["homeLocationZ"].ToString())); 323 Convert.ToSingle(reader["homeLocationZ"].ToString()));
331 retval.homeLookAt = new libsecondlife.LLVector3( 324 retval.homeLookAt = new LLVector3(
332 Convert.ToSingle(reader["homeLookAtX"].ToString()), 325 Convert.ToSingle(reader["homeLookAtX"].ToString()),
333 Convert.ToSingle(reader["homeLookAtY"].ToString()), 326 Convert.ToSingle(reader["homeLookAtY"].ToString()),
334 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 327 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -345,8 +338,8 @@ namespace OpenSim.Framework.Data.MySQL
345 retval.profileAboutText = (string)reader["profileAboutText"]; 338 retval.profileAboutText = (string)reader["profileAboutText"];
346 retval.profileFirstText = (string)reader["profileFirstText"]; 339 retval.profileFirstText = (string)reader["profileFirstText"];
347 340
348 retval.profileImage = new libsecondlife.LLUUID((string)reader["profileImage"]); 341 retval.profileImage = new LLUUID((string)reader["profileImage"]);
349 retval.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]); 342 retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
350 343
351 } 344 }
352 else 345 else
@@ -371,9 +364,9 @@ namespace OpenSim.Framework.Data.MySQL
371 { 364 {
372 InventoryFolderBase folder = new InventoryFolderBase(); 365 InventoryFolderBase folder = new InventoryFolderBase();
373 366
374 folder.agentID = new libsecondlife.LLUUID((string)reader["agentID"]); 367 folder.agentID = new LLUUID((string)reader["agentID"]);
375 folder.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]); 368 folder.parentID = new LLUUID((string)reader["parentFolderID"]);
376 folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]); 369 folder.folderID = new LLUUID((string)reader["folderID"]);
377 folder.name = (string)reader["folderName"]; 370 folder.name = (string)reader["folderName"];
378 371
379 rows.Add(folder); 372 rows.Add(folder);
@@ -402,14 +395,14 @@ namespace OpenSim.Framework.Data.MySQL
402 { 395 {
403 InventoryItemBase item = new InventoryItemBase(); 396 InventoryItemBase item = new InventoryItemBase();
404 397
405 item.assetID = new libsecondlife.LLUUID((string)reader["assetID"]); 398 item.assetID = new LLUUID((string)reader["assetID"]);
406 item.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]); 399 item.avatarID = new LLUUID((string)reader["avatarID"]);
407 item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString()); 400 item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
408 item.inventoryDescription = (string)reader["inventoryDescription"]; 401 item.inventoryDescription = (string)reader["inventoryDescription"];
409 item.inventoryID = new libsecondlife.LLUUID((string)reader["inventoryID"]); 402 item.inventoryID = new LLUUID((string)reader["inventoryID"]);
410 item.inventoryName = (string)reader["inventoryName"]; 403 item.inventoryName = (string)reader["inventoryName"];
411 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString()); 404 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
412 item.parentFolderID = new libsecondlife.LLUUID((string)reader["parentFolderID"]); 405 item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
413 item.type = Convert.ToInt32(reader["type"].ToString()); 406 item.type = Convert.ToInt32(reader["type"].ToString());
414 407
415 rows.Add(item); 408 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Data;
31using OpenSim.Framework.Data;
32using libsecondlife; 31using libsecondlife;
33 32
34namespace OpenSim.Framework.Data.MySQL 33namespace OpenSim.Framework.Data.MySQL
@@ -87,8 +86,8 @@ namespace OpenSim.Framework.Data.MySQL
87 param["?first"] = user; 86 param["?first"] = user;
88 param["?second"] = last; 87 param["?second"] = last;
89 88
90 System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param); 89 IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
91 System.Data.IDataReader reader = result.ExecuteReader(); 90 IDataReader reader = result.ExecuteReader();
92 91
93 UserProfileData row = database.readUserRow(reader); 92 UserProfileData row = database.readUserRow(reader);
94 93
@@ -120,8 +119,8 @@ namespace OpenSim.Framework.Data.MySQL
120 Dictionary<string, string> param = new Dictionary<string, string>(); 119 Dictionary<string, string> param = new Dictionary<string, string>();
121 param["?uuid"] = uuid.ToStringHyphenated(); 120 param["?uuid"] = uuid.ToStringHyphenated();
122 121
123 System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param); 122 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
124 System.Data.IDataReader reader = result.ExecuteReader(); 123 IDataReader reader = result.ExecuteReader();
125 124
126 UserProfileData row = database.readUserRow(reader); 125 UserProfileData row = database.readUserRow(reader);
127 126
@@ -175,8 +174,8 @@ namespace OpenSim.Framework.Data.MySQL
175 Dictionary<string, string> param = new Dictionary<string, string>(); 174 Dictionary<string, string> param = new Dictionary<string, string>();
176 param["?uuid"] = uuid.ToStringHyphenated(); 175 param["?uuid"] = uuid.ToStringHyphenated();
177 176
178 System.Data.IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param); 177 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
179 System.Data.IDataReader reader = result.ExecuteReader(); 178 IDataReader reader = result.ExecuteReader();
180 179
181 UserAgentData row = database.readAgentRow(reader); 180 UserAgentData row = database.readAgentRow(reader);
182 181
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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.SQLite 35namespace OpenSim.Framework.Data.SQLite
34{ 36{
@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.SQLite
99 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
100 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
101 103
102 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); 104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
103 System.Data.IDataReader reader = result.ExecuteReader(); 105 IDataReader reader = result.ExecuteReader();
104 106
105 SimProfileData row = database.getRow(reader); 107 SimProfileData row = database.getRow(reader);
106 reader.Close(); 108 reader.Close();
@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.SQLite
114 /// </summary> 116 /// </summary>
115 /// <param name="uuid">The region UUID</param> 117 /// <param name="uuid">The region UUID</param>
116 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
117 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 119 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
118 { 120 {
119 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
120 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToStringHyphenated();
121 123
122 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
123 System.Data.IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
124 126
125 SimProfileData row = database.getRow(reader); 127 SimProfileData row = database.getRow(reader);
126 reader.Close(); 128 reader.Close();
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.SQLite
153 /// <param name="handle">The attempted regionHandle of the challenger</param> 155 /// <param name="handle">The attempted regionHandle of the challenger</param>
154 /// <param name="authkey">The secret</param> 156 /// <param name="authkey">The secret</param>
155 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 157 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
156 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 158 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
157 { 159 {
158 bool throwHissyFit = false; // Should be true by 1.0 160 bool throwHissyFit = false; // Should be true by 1.0
159 161
@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.SQLite
174 /// <param name="authhash"></param> 176 /// <param name="authhash"></param>
175 /// <param name="challenge"></param> 177 /// <param name="challenge"></param>
176 /// <returns></returns> 178 /// <returns></returns>
177 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 179 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
178 { 180 {
179 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 181 SHA512Managed HashProvider = new SHA512Managed();
180 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 182 ASCIIEncoding TextProvider = new ASCIIEncoding();
181 183
182 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 184 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
183 byte[] hash = HashProvider.ComputeHash(stream); 185 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32
33using System.Data.SQLite; 31using System.Data.SQLite;
34 32using libsecondlife;
35using OpenSim.Framework.Data;
36 33
37namespace OpenSim.Framework.Data.SQLite 34namespace OpenSim.Framework.Data.SQLite
38{ 35{
@@ -105,7 +102,7 @@ namespace OpenSim.Framework.Data.SQLite
105 // Region Main 102 // Region Main
106 retval.regionHandle = (ulong)reader["regionHandle"]; 103 retval.regionHandle = (ulong)reader["regionHandle"];
107 retval.regionName = (string)reader["regionName"]; 104 retval.regionName = (string)reader["regionName"];
108 retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 105 retval.UUID = new LLUUID((string)reader["uuid"]);
109 106
110 // Secrets 107 // Secrets
111 retval.regionRecvKey = (string)reader["regionRecvKey"]; 108 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data 30namespace OpenSim.Framework.Data
33{ 31{
@@ -56,7 +54,7 @@ namespace OpenSim.Framework.Data
56 /// </summary> 54 /// </summary>
57 /// <param name="UUID">A 128bit UUID</param> 55 /// <param name="UUID">A 128bit UUID</param>
58 /// <returns>A sim profile</returns> 56 /// <returns>A sim profile</returns>
59 SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID); 57 SimProfileData GetProfileByLLUUID(LLUUID UUID);
60 58
61 /// <summary> 59 /// <summary>
62 /// Returns all profiles within the specified range 60 /// Returns all profiles within the specified range
@@ -76,7 +74,7 @@ namespace OpenSim.Framework.Data
76 /// <param name="regionHandle">The regionhandle sent by the sim</param> 74 /// <param name="regionHandle">The regionhandle sent by the sim</param>
77 /// <param name="simrecvkey">The recieving key sent by the sim</param> 75 /// <param name="simrecvkey">The recieving key sent by the sim</param>
78 /// <returns>Whether the sim has been authenticated</returns> 76 /// <returns>Whether the sim has been authenticated</returns>
79 bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey); 77 bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
80 78
81 /// <summary> 79 /// <summary>
82 /// Initialises the interface 80 /// 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework.Data 28namespace OpenSim.Framework.Data
33{ 29{
34 /// <summary> 30 /// <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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.IO; 28using System.IO;
32using System.Text.RegularExpressions; 29using System.Text.RegularExpressions;
33
34/* 30/*
35 Taken from public code listing at by Alex Pinsker 31 Taken from public code listing at by Alex Pinsker
36 http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html 32 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework.Data 31namespace 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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 28using libsecondlife;
33 29
34namespace OpenSim.Framework.Data 30namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data 30namespace OpenSim.Framework.Data
33{ 31{
@@ -49,7 +47,7 @@ namespace OpenSim.Framework.Data
49 /// <summary> 47 /// <summary>
50 /// OGS/OpenSim Specific ID for a region 48 /// OGS/OpenSim Specific ID for a region
51 /// </summary> 49 /// </summary>
52 public libsecondlife.LLUUID UUID; 50 public LLUUID UUID;
53 51
54 /// <summary> 52 /// <summary>
55 /// Coordinates of the region 53 /// Coordinates of the region
@@ -109,6 +107,6 @@ namespace OpenSim.Framework.Data
109 /// <summary> 107 /// <summary>
110 /// Region Map Texture Asset 108 /// Region Map Texture Asset
111 /// </summary> 109 /// </summary>
112 public libsecondlife.LLUUID regionMapTextureID = new libsecondlife.LLUUID("00000000-0000-0000-9999-000000000006"); 110 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
113 } 111 }
114} 112}
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Data 30namespace 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework.Data 31namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32using libsecondlife.Packets; 30using libsecondlife.Packets;
33using OpenSim.Framework.Types; 31using 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Types; 31using 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Threading;
30using System.Collections.Generic; 28using System.Collections.Generic;
31using System.Text; 29using System.Threading;
32 30
33namespace OpenSim.Framework.Utilities 31namespace OpenSim.Framework.Utilities
34{ 32{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text; 29using libsecondlife;
31using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Types; 31using OpenSim.Framework.Types;
33 32
@@ -35,7 +34,7 @@ namespace OpenSim.Framework
35{ 34{
36 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent); 35 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
37 public delegate void UpdateNeighbours(List<RegionInfo> neighbours); 36 public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
38 public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 37 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
39 38
40 public interface IRegionCommsListener 39 public interface IRegionCommsListener
41 { 40 {
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Net;
32using System.Net.Sockets;
33using System.IO;
34using libsecondlife;
35using OpenSim;
36using OpenSim.Framework.Types; 28using OpenSim.Framework.Types;
37 29
38namespace OpenSim.Framework.Interfaces 30namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework.Interfaces 28namespace OpenSim.Framework.Interfaces
33{ 29{
34 public interface IGenericConfig 30 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 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33//using OpenSim.world; 29//using OpenSim.world;
34 30
35namespace OpenSim.Framework.Interfaces 31namespace 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 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33//using OpenSim.world; 29//using OpenSim.world;
34 30
35namespace OpenSim.Framework.Interfaces 31namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Net;
30using System.Net.Sockets;
31using System.IO;
32using System.Threading;
33using libsecondlife; 28using libsecondlife;
34using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
35 30
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text; 29using System.Net;
31using OpenSim.Framework.Inventory;
32using libsecondlife; 30using libsecondlife;
33using libsecondlife.Packets; 31using libsecondlife.Packets;
34using OpenSim.Framework.Types; 32using OpenSim.Framework.Types;
35using System.Net;
36 33
37namespace OpenSim.Framework.Interfaces 34namespace OpenSim.Framework.Interfaces
38{ 35{
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 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using libsecondlife; 29using libsecondlife;
31using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
32 31
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Inventory;
32using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework.Inventory;
33 30
34namespace OpenSim.Framework.Interfaces 31namespace OpenSim.Framework.Interfaces
35{ 32{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
33 30
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using Nwc.XmlRpc;
33using libsecondlife;
34
35namespace OpenSim.Framework.Grid 28namespace OpenSim.Framework.Grid
36{ 29{
37 public abstract class LoginService 30 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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Interfaces; 29using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
33 31
@@ -57,7 +55,7 @@ namespace OpenSim.Framework
57 return false; 55 return false;
58 } 56 }
59 57
60 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 58 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
61 { 59 {
62 if (OnAvatarCrossingIntoRegion != null) 60 if (OnAvatarCrossingIntoRegion != null)
63 { 61 {
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Security.Cryptography; 29using System.Security.Cryptography;
30using System.Text;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Collections; 29using System.Collections;
31using System.Xml;
32using System.Text;
33using libsecondlife; 30using libsecondlife;
34using Nwc.XmlRpc; 31using Nwc.XmlRpc;
35 32
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text; 28using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
@@ -51,7 +49,7 @@ namespace OpenSim.Framework.Types
51 49
52 private void InternData() 50 private void InternData()
53 { 51 {
54 string temp = System.Text.Encoding.UTF8.GetString(Data).Trim(); 52 string temp = Encoding.UTF8.GetString(Data).Trim();
55 string[] parts = temp.Split('\n'); 53 string[] parts = temp.Split('\n');
56 int.TryParse(parts[0].Substring(17, 1), out Version); 54 int.TryParse(parts[0].Substring(17, 1), out Version);
57 LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID); 55 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace 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 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33using libsecondlife; 29using libsecondlife;
34 30
35namespace OpenSim.Framework.Types 31namespace OpenSim.Framework.Types
@@ -46,8 +42,8 @@ namespace OpenSim.Framework.Types
46 42
47 public int redirectGridX = 0; //?? 43 public int redirectGridX = 0; //??
48 public int redirectGridY = 0; //?? 44 public int redirectGridY = 0; //??
49 public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings 45 public Simulator.RegionFlags regionFlags = Simulator.RegionFlags.None; //Booleam values of various region settings
50 public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default. 46 public Simulator.SimAccess simAccess = Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
51 public float sunHour = 0; 47 public float sunHour = 0;
52 48
53 public float terrainRaiseLimit = 0; 49 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace 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 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 2using libsecondlife;
5 3
6namespace OpenSim.Framework.Types 4namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Utilities;
33using OpenSim.Framework.Console;
34using libsecondlife;
35
36namespace OpenSim.Framework.Types 28namespace OpenSim.Framework.Types
37{ 29{
38 public class NeighbourInfo 30 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using OpenSim.Framework.Console;
30using System.Text;
31using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
32 31
33namespace OpenSim.Framework.Types 32namespace OpenSim.Framework.Types
@@ -63,7 +62,7 @@ namespace OpenSim.Framework.Types
63 attri = configData.GetAttribute("HttpListenerPort"); 62 attri = configData.GetAttribute("HttpListenerPort");
64 if (attri == "") 63 if (attri == "")
65 { 64 {
66 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000"); 65 string location = MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
67 configData.SetAttribute("HttpListenerPort", location); 66 configData.SetAttribute("HttpListenerPort", location);
68 this.HttpListenerPort = Convert.ToInt32(location); 67 this.HttpListenerPort = Convert.ToInt32(location);
69 } 68 }
@@ -76,7 +75,7 @@ namespace OpenSim.Framework.Types
76 attri = configData.GetAttribute("RemotingListenerPort"); 75 attri = configData.GetAttribute("RemotingListenerPort");
77 if (attri == "") 76 if (attri == "")
78 { 77 {
79 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895"); 78 string location = MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
80 configData.SetAttribute("RemotingListenerPort", location); 79 configData.SetAttribute("RemotingListenerPort", location);
81 this.RemotingListenerPort = Convert.ToInt32(location); 80 this.RemotingListenerPort = Convert.ToInt32(location);
82 } 81 }
@@ -92,7 +91,7 @@ namespace OpenSim.Framework.Types
92 attri = configData.GetAttribute("DefaultLocationX"); 91 attri = configData.GetAttribute("DefaultLocationX");
93 if (attri == "") 92 if (attri == "")
94 { 93 {
95 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000"); 94 string location = MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
96 configData.SetAttribute("DefaultLocationX", location); 95 configData.SetAttribute("DefaultLocationX", location);
97 this.DefaultHomeLocX = (uint)Convert.ToUInt32(location); 96 this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
98 } 97 }
@@ -106,7 +105,7 @@ namespace OpenSim.Framework.Types
106 attri = configData.GetAttribute("DefaultLocationY"); 105 attri = configData.GetAttribute("DefaultLocationY");
107 if (attri == "") 106 if (attri == "")
108 { 107 {
109 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000"); 108 string location = MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
110 configData.SetAttribute("DefaultLocationY", location); 109 configData.SetAttribute("DefaultLocationY", location);
111 this.DefaultHomeLocY = (uint)Convert.ToUInt32(location); 110 this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
112 } 111 }
@@ -122,7 +121,7 @@ namespace OpenSim.Framework.Types
122 attri = configData.GetAttribute("GridServerURL"); 121 attri = configData.GetAttribute("GridServerURL");
123 if (attri == "") 122 if (attri == "")
124 { 123 {
125 this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); 124 this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
126 configData.SetAttribute("GridServerURL", this.GridURL); 125 configData.SetAttribute("GridServerURL", this.GridURL);
127 } 126 }
128 else 127 else
@@ -135,7 +134,7 @@ namespace OpenSim.Framework.Types
135 attri = configData.GetAttribute("GridSendKey"); 134 attri = configData.GetAttribute("GridSendKey");
136 if (attri == "") 135 if (attri == "")
137 { 136 {
138 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null"); 137 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
139 configData.SetAttribute("GridSendKey", this.GridSendKey); 138 configData.SetAttribute("GridSendKey", this.GridSendKey);
140 } 139 }
141 else 140 else
@@ -148,7 +147,7 @@ namespace OpenSim.Framework.Types
148 attri = configData.GetAttribute("GridRecvKey"); 147 attri = configData.GetAttribute("GridRecvKey");
149 if (attri == "") 148 if (attri == "")
150 { 149 {
151 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null"); 150 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
152 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 151 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
153 } 152 }
154 else 153 else
@@ -161,7 +160,7 @@ namespace OpenSim.Framework.Types
161 attri = configData.GetAttribute("UserServerURL"); 160 attri = configData.GetAttribute("UserServerURL");
162 if (attri == "") 161 if (attri == "")
163 { 162 {
164 this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/"); 163 this.UserURL= MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
165 configData.SetAttribute("UserServerURL", this.UserURL); 164 configData.SetAttribute("UserServerURL", this.UserURL);
166 } 165 }
167 else 166 else
@@ -174,7 +173,7 @@ namespace OpenSim.Framework.Types
174 attri = configData.GetAttribute("UserSendKey"); 173 attri = configData.GetAttribute("UserSendKey");
175 if (attri == "") 174 if (attri == "")
176 { 175 {
177 this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null"); 176 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server", "null");
178 configData.SetAttribute("UserSendKey", this.UserSendKey); 177 configData.SetAttribute("UserSendKey", this.UserSendKey);
179 } 178 }
180 else 179 else
@@ -187,7 +186,7 @@ namespace OpenSim.Framework.Types
187 attri = configData.GetAttribute("UserRecvKey"); 186 attri = configData.GetAttribute("UserRecvKey");
188 if (attri == "") 187 if (attri == "")
189 { 188 {
190 this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); 189 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
191 configData.SetAttribute("GridRecvKey", this.UserRecvKey); 190 configData.SetAttribute("GridRecvKey", this.UserRecvKey);
192 } 191 }
193 else 192 else
@@ -199,7 +198,7 @@ namespace OpenSim.Framework.Types
199 attri = configData.GetAttribute("AssetServerURL"); 198 attri = configData.GetAttribute("AssetServerURL");
200 if (attri == "") 199 if (attri == "")
201 { 200 {
202 this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); 201 this.AssetURL = MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
203 configData.SetAttribute("AssetServerURL", this.GridURL); 202 configData.SetAttribute("AssetServerURL", this.GridURL);
204 } 203 }
205 else 204 else
@@ -212,8 +211,8 @@ namespace OpenSim.Framework.Types
212 } 211 }
213 catch (Exception e) 212 catch (Exception e)
214 { 213 {
215 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 214 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
216 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 215 MainLog.Instance.Warn(e.ToString());
217 } 216 }
218 } 217 }
219 } 218 }
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
@@ -45,14 +42,14 @@ namespace OpenSim.Framework.Types
45 public int area = 0; 42 public int area = 0;
46 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned 43 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
47 public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID 44 public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
48 public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 45 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
49 public int claimDate = 0; //Unemplemented 46 public int claimDate = 0; //Unemplemented
50 public int claimPrice = 0; //Unemplemented 47 public int claimPrice = 0; //Unemplemented
51 public LLUUID groupID = new LLUUID(); //Unemplemented 48 public LLUUID groupID = new LLUUID(); //Unemplemented
52 public int groupPrims = 0; //Unemplemented 49 public int groupPrims = 0; //Unemplemented
53 public int salePrice = 0; //Unemeplemented. Parcels price. 50 public int salePrice = 0; //Unemeplemented. Parcels price.
54 public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None; 51 public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.None;
55 public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None; 52 public Parcel.ParcelFlags parcelFlags = Parcel.ParcelFlags.None;
56 public byte landingType = 0; 53 public byte landingType = 0;
57 public byte mediaAutoScale = 0; 54 public byte mediaAutoScale = 0;
58 public LLUUID mediaID = LLUUID.Zero; 55 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework.Types 31namespace 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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 1using libsecondlife;
5using libsecondlife.Packets;
6using OpenSim.Framework.Interfaces;
7 2
8namespace OpenSim.Framework.Types 3namespace OpenSim.Framework.Types
9{ 4{
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 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.Net; 2using System.Net;
5 3
6namespace OpenSim.Framework.Types 4namespace 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Globalization; 29using System.Globalization;
30using System.Net;
31using System.Net.Sockets;
32using libsecondlife;
33using OpenSim.Framework.Console;
32using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Utilities; 35using OpenSim.Framework.Utilities;
34using OpenSim.Framework.Console;
35using libsecondlife;
36using System.Net;
37 36
38namespace OpenSim.Framework.Types 37namespace OpenSim.Framework.Types
39{ 38{
@@ -65,7 +64,7 @@ namespace OpenSim.Framework.Types
65 if (ia == null) 64 if (ia == null)
66 ia = Adr; 65 ia = Adr;
67 66
68 if (Adr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) 67 if (Adr.AddressFamily == AddressFamily.InterNetwork)
69 { 68 {
70 ia = Adr; 69 ia = Adr;
71 break; 70 break;
@@ -170,7 +169,7 @@ namespace OpenSim.Framework.Types
170 attri = configData.GetAttribute("SimLocationX"); 169 attri = configData.GetAttribute("SimLocationX");
171 if (attri == "") 170 if (attri == "")
172 { 171 {
173 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000"); 172 string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000");
174 configData.SetAttribute("SimLocationX", location); 173 configData.SetAttribute("SimLocationX", location);
175 m_regionLocX = (uint)Convert.ToUInt32(location); 174 m_regionLocX = (uint)Convert.ToUInt32(location);
176 } 175 }
@@ -183,7 +182,7 @@ namespace OpenSim.Framework.Types
183 attri = configData.GetAttribute("SimLocationY"); 182 attri = configData.GetAttribute("SimLocationY");
184 if (attri == "") 183 if (attri == "")
185 { 184 {
186 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); 185 string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
187 configData.SetAttribute("SimLocationY", location); 186 configData.SetAttribute("SimLocationY", location);
188 m_regionLocY = (uint)Convert.ToUInt32(location); 187 m_regionLocY = (uint)Convert.ToUInt32(location);
189 } 188 }
@@ -209,7 +208,7 @@ namespace OpenSim.Framework.Types
209 attri = configData.GetAttribute("TerrainMultiplier"); 208 attri = configData.GetAttribute("TerrainMultiplier");
210 if (attri == "") 209 if (attri == "")
211 { 210 {
212 string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); 211 string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
213 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); 212 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
214 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString()); 213 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
215 } 214 }
@@ -222,7 +221,7 @@ namespace OpenSim.Framework.Types
222 attri = configData.GetAttribute("MasterAvatarFirstName"); 221 attri = configData.GetAttribute("MasterAvatarFirstName");
223 if (attri == "") 222 if (attri == "")
224 { 223 {
225 this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test"); 224 this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
226 225
227 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName); 226 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
228 } 227 }
@@ -235,7 +234,7 @@ namespace OpenSim.Framework.Types
235 attri = configData.GetAttribute("MasterAvatarLastName"); 234 attri = configData.GetAttribute("MasterAvatarLastName");
236 if (attri == "") 235 if (attri == "")
237 { 236 {
238 this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User"); 237 this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
239 238
240 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName); 239 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
241 } 240 }
@@ -250,7 +249,7 @@ namespace OpenSim.Framework.Types
250 attri = configData.GetAttribute("MasterAvatarSandboxPassword"); 249 attri = configData.GetAttribute("MasterAvatarSandboxPassword");
251 if (attri == "") 250 if (attri == "")
252 { 251 {
253 this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); 252 this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
254 253
255 //Should I store this? 254 //Should I store this?
256 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword); 255 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
@@ -265,17 +264,17 @@ namespace OpenSim.Framework.Types
265 } 264 }
266 catch (Exception e) 265 catch (Exception e)
267 { 266 {
268 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 267 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
269 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 268 MainLog.Instance.Warn(e.ToString());
270 } 269 }
271 270
272 OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:"); 271 MainLog.Instance.Verbose("Sim settings loaded:");
273 OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated()); 272 MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
274 OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName); 273 MainLog.Instance.Verbose("Name: " + this.RegionName);
275 OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); 274 MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
276 OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString()); 275 MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
277 OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() ); 276 MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
278 OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString()); 277 MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
279 278
280 } 279 }
281 280
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 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 2using libsecondlife;
5 3
6namespace OpenSim.Framework.Types 4namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text; 29using System.Security.Cryptography;
31using libsecondlife; 30using libsecondlife;
32using OpenSim.Framework.Inventory; 31using OpenSim.Framework.Inventory;
33using System.Security.Cryptography;
34 32
35namespace OpenSim.Framework.User 33namespace OpenSim.Framework.User
36{ 34{
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 @@
27*/ 27*/
28using System; 28using System;
29using System.Security.Cryptography; 29using System.Security.Cryptography;
30using System.Collections.Generic;
31using System.Text; 30using System.Text;
32using libsecondlife; 31using libsecondlife;
33using libsecondlife.Packets;
34 32
35namespace OpenSim.Framework.Utilities 33namespace OpenSim.Framework.Utilities
36{ 34{
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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.IO;
30using System.Text;
31using System.Xml; 30using System.Xml;
32using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
33 32
@@ -50,7 +49,7 @@ namespace OpenSim.GenericConfig
50 { 49 {
51 doc = new XmlDocument(); 50 doc = new XmlDocument();
52 51
53 if (System.IO.File.Exists(fileName)) 52 if (File.Exists(fileName))
54 { 53 {
55 XmlTextReader reader = new XmlTextReader(fileName); 54 XmlTextReader reader = new XmlTextReader(fileName);
56 reader.WhitespaceHandling = WhitespaceHandling.None; 55 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO;
30using System.Net; 32using System.Net;
31using System.Text; 33using System.Text;
32using System.Text.RegularExpressions; 34using System.Text.RegularExpressions;
33using System.Threading; 35using System.Threading;
34using Nwc.XmlRpc; 36using Nwc.XmlRpc;
35using System.Collections;
36using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
37 38
38namespace OpenSim.Framework.Servers 39namespace OpenSim.Framework.Servers
@@ -199,9 +200,9 @@ namespace OpenSim.Framework.Servers
199 response.KeepAlive = false; 200 response.KeepAlive = false;
200 response.SendChunked = false; 201 response.SendChunked = false;
201 202
202 System.IO.Stream body = request.InputStream; 203 Stream body = request.InputStream;
203 System.Text.Encoding encoding = System.Text.Encoding.UTF8; 204 Encoding encoding = Encoding.UTF8;
204 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); 205 StreamReader reader = new StreamReader(body, encoding);
205 206
206 string requestBody = reader.ReadToEnd(); 207 string requestBody = reader.ReadToEnd();
207 body.Close(); 208 body.Close();
@@ -245,8 +246,8 @@ namespace OpenSim.Framework.Servers
245 246
246 } 247 }
247 248
248 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); 249 byte[] buffer = Encoding.UTF8.GetBytes(responseString);
249 System.IO.Stream output = response.OutputStream; 250 Stream output = response.OutputStream;
250 response.SendChunked = false; 251 response.SendChunked = false;
251 response.ContentLength64 = buffer.Length; 252 response.ContentLength64 = buffer.Length;
252 output.Write(buffer, 0, buffer.Length); 253 output.Write(buffer, 0, buffer.Length);
@@ -260,7 +261,7 @@ namespace OpenSim.Framework.Servers
260 261
261 public void Start() 262 public void Start()
262 { 263 {
263 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server"); 264 MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
264 265
265 m_workerThread = new Thread(new ThreadStart(StartHTTP)); 266 m_workerThread = new Thread(new ThreadStart(StartHTTP));
266 m_workerThread.IsBackground = true; 267 m_workerThread.IsBackground = true;
@@ -271,7 +272,7 @@ namespace OpenSim.Framework.Servers
271 { 272 {
272 try 273 try
273 { 274 {
274 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); 275 MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
275 m_httpListener = new HttpListener(); 276 m_httpListener = new HttpListener();
276 277
277 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 278 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -286,7 +287,7 @@ namespace OpenSim.Framework.Servers
286 } 287 }
287 catch (Exception e) 288 catch (Exception e)
288 { 289 {
289 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); 290 MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
290 } 291 }
291 } 292 }
292 293
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Text;
30using System.IO;
31using System.Threading;
32using System.Net;
33using System.Net.Sockets;
34using System.Timers;
35using System.Reflection;
36using System.Collections;
37using System.Collections.Generic;
38using libsecondlife;
39using libsecondlife.Packets;
40using OpenSim.Framework.Console;
41
42
43namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
44{ 29{
45/* public class CheckSumServer : UDPServerBase 30/* 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 @@
1using System; 1/*
2using System.Collections.Generic; 2* Copyright (c) Contributors, http://www.openmetaverse.org/
3using System.Text; 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
4 28
5namespace OpenSim.Framework.Servers 29namespace OpenSim.Framework.Servers
6{ 30{
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 @@
1using System; 1/*
2using System.Collections.Generic; 2* Copyright (c) Contributors, http://www.openmetaverse.org/
3using System.Text; 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
4 28
5namespace OpenSim.Framework.Servers 29namespace OpenSim.Framework.Servers
6{ 30{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
33{ 29{
34 public delegate string RestMethod( string request, string path, string param ); 30 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Text;
30using System.IO;
31using System.Threading;
32using System.Net; 29using System.Net;
33using System.Net.Sockets; 30using System.Net.Sockets;
34using System.Timers;
35using System.Reflection;
36using System.Collections;
37using System.Collections.Generic;
38using libsecondlife;
39using libsecondlife.Packets; 31using libsecondlife.Packets;
40 32
41namespace OpenSim.Framework.Servers 33namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using Nwc.XmlRpc; 28using Nwc.XmlRpc;
30 29
31namespace OpenSim.Framework.Servers 30namespace 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 @@
1using System; 1using System;
2using System.Text;
3using System.Text.RegularExpressions;
4using System.Threading;
5using System.Collections; 2using System.Collections;
6using System.Xml;
7using libsecondlife; 3using libsecondlife;
8using OpenSim.Framework.Utilities;
9using OpenSim.Framework.Interfaces;
10using Nwc.XmlRpc; 4using Nwc.XmlRpc;
5using OpenSim.Framework.Console;
11 6
12namespace OpenSim.Framework.UserManagement 7namespace OpenSim.Framework.UserManagement
13{ 8{
@@ -227,7 +222,7 @@ namespace OpenSim.Framework.UserManagement
227 222
228 responseData["sim_port"] =(Int32) this.SimPort; 223 responseData["sim_port"] =(Int32) this.SimPort;
229 responseData["sim_ip"] = this.SimAddress; 224 responseData["sim_ip"] = this.SimAddress;
230 Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]); 225 MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
231 responseData["agent_id"] = this.AgentID.ToStringHyphenated(); 226 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
232 responseData["session_id"] = this.SessionID.ToStringHyphenated(); 227 responseData["session_id"] = this.SessionID.ToStringHyphenated();
233 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); 228 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
@@ -266,8 +261,8 @@ namespace OpenSim.Framework.UserManagement
266 } 261 }
267 catch (Exception e) 262 catch (Exception e)
268 { 263 {
269 OpenSim.Framework.Console.MainLog.Instance.WriteLine( 264 MainLog.Instance.WriteLine(
270 OpenSim.Framework.Console.LogPriority.LOW, 265 LogPriority.LOW,
271 "LoginResponse: Error creating XML-RPC Response: " + e.Message 266 "LoginResponse: Error creating XML-RPC Response: " + e.Message
272 ); 267 );
273 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); 268 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 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Data;
33using libsecondlife;
34using System.Reflection; 31using System.Reflection;
35 32using System.Security.Cryptography;
36using System.Xml; 33using libsecondlife;
37using Nwc.XmlRpc; 34using Nwc.XmlRpc;
38using OpenSim.Framework.Sims; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Data;
37using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Inventory; 38using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
41 40
42using System.Security.Cryptography;
43
44namespace OpenSim.Framework.UserManagement 41namespace OpenSim.Framework.UserManagement
45{ 42{
46 public abstract class UserManagerBase 43 public abstract class UserManagerBase
47 { 44 {
48 public OpenSim.Framework.Interfaces.UserConfig _config; 45 public UserConfig _config;
49 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); 46 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
50 47
51 /// <summary> 48 /// <summary>
@@ -54,10 +51,10 @@ namespace OpenSim.Framework.UserManagement
54 /// <param name="FileName">The filename to the user server plugin DLL</param> 51 /// <param name="FileName">The filename to the user server plugin DLL</param>
55 public void AddPlugin(string FileName) 52 public void AddPlugin(string FileName)
56 { 53 {
57 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName); 54 MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
58 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 55 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
59 56
60 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 57 MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
61 foreach (Type pluginType in pluginAssembly.GetTypes()) 58 foreach (Type pluginType in pluginAssembly.GetTypes())
62 { 59 {
63 if (!pluginType.IsAbstract) 60 if (!pluginType.IsAbstract)
@@ -69,7 +66,7 @@ namespace OpenSim.Framework.UserManagement
69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 66 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 67 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 68 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface"); 69 MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
73 } 70 }
74 71
75 typeInterface = null; 72 typeInterface = null;
@@ -97,7 +94,7 @@ namespace OpenSim.Framework.UserManagement
97 } 94 }
98 catch (Exception e) 95 catch (Exception e)
99 { 96 {
100 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 97 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
101 } 98 }
102 } 99 }
103 100
@@ -122,7 +119,7 @@ namespace OpenSim.Framework.UserManagement
122 } 119 }
123 catch (Exception e) 120 catch (Exception e)
124 { 121 {
125 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 122 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
126 } 123 }
127 } 124 }
128 125
@@ -149,7 +146,7 @@ namespace OpenSim.Framework.UserManagement
149 } 146 }
150 catch (Exception e) 147 catch (Exception e)
151 { 148 {
152 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 149 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
153 } 150 }
154 } 151 }
155 152
@@ -173,7 +170,7 @@ namespace OpenSim.Framework.UserManagement
173 } 170 }
174 catch (Exception e) 171 catch (Exception e)
175 { 172 {
176 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 173 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
177 } 174 }
178 } 175 }
179 176
@@ -195,7 +192,7 @@ namespace OpenSim.Framework.UserManagement
195 } 192 }
196 catch (Exception e) 193 catch (Exception e)
197 { 194 {
198 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 195 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
199 } 196 }
200 } 197 }
201 198
@@ -218,7 +215,7 @@ namespace OpenSim.Framework.UserManagement
218 } 215 }
219 catch (Exception e) 216 catch (Exception e)
220 { 217 {
221 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 218 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
222 } 219 }
223 } 220 }
224 221
@@ -314,7 +311,7 @@ namespace OpenSim.Framework.UserManagement
314 /// <returns>Authenticated?</returns> 311 /// <returns>Authenticated?</returns>
315 public virtual bool AuthenticateUser(UserProfileData profile, string password) 312 public virtual bool AuthenticateUser(UserProfileData profile, string password)
316 { 313 {
317 OpenSim.Framework.Console.MainLog.Instance.Verbose( 314 MainLog.Instance.Verbose(
318 "Authenticating " + profile.username + " " + profile.surname); 315 "Authenticating " + profile.username + " " + profile.surname);
319 316
320 password = password.Remove(0, 3); //remove $1$ 317 password = password.Remove(0, 3); //remove $1$
@@ -517,7 +514,7 @@ namespace OpenSim.Framework.UserManagement
517 } 514 }
518 catch (Exception e) 515 catch (Exception e)
519 { 516 {
520 OpenSim.Framework.Console.MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); 517 MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
521 } 518 }
522 } 519 }
523 } 520 }