aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General')
-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
36 files changed, 49 insertions, 157 deletions
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{