1 files changed, 40 insertions, 41 deletions
diff --git a/src/Config.cs b/OpenSim.Framework/IConfig.cs
index 1c0a6cc..ca7f645 100644
--- a/src/Config.cs
+++ b/OpenSim.Framework/IConfig.cs
@@ -31,49 +31,48 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using libsecondlife;
-using OpenSim.world;
+//using OpenSim.world;
-namespace OpenSim
+namespace OpenSim.Framework.Interfaces
 {
-        /// <summary>
+    /// <summary>
-        /// This class handles connection to the underlying database used for configuration of the region.
+    /// This class handles connection to the underlying database used for configuration of the region.
-        /// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate
+    /// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate
-        /// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from
+    /// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from
-        /// what is hardcoded here and then saved into opensim.yap for future startups.
+    /// what is hardcoded here and then saved into opensim.yap for future startups.
-        /// </summary>
+    /// </summary>
-        
-        
-        public abstract class SimConfig
+    public abstract class SimConfig
-        {
+    {
-                public string RegionName;
+        public string RegionName;
-                
-                public uint RegionLocX;
+        public uint RegionLocX;
-                public uint RegionLocY;
+        public uint RegionLocY;
-                public ulong RegionHandle;
+        public ulong RegionHandle;
-                
-                public int IPListenPort;
+        public int IPListenPort;
-                public string IPListenAddr;
+        public string IPListenAddr;
-                
        public string AssetURL;
-            public string AssetSendKey;
+        public string AssetSendKey;
-                
-            public string GridURL;
+        public string GridURL;
-            public string GridSendKey;
+        public string GridSendKey;
-            public string GridRecvKey;
+        public string GridRecvKey;
-            public string UserURL;
+        public string UserURL;
-            public string UserSendKey;
+        public string UserSendKey;
-            public string UserRecvKey;
+        public string UserRecvKey;
+        public abstract void InitConfig(bool sandboxMode);
+        public abstract void LoadFromGrid(); 
+        public abstract float[] LoadWorld();
+        public abstract void SaveMap(float[] heightmap);
+    }
-        
+    public interface ISimConfig
-            public abstract void InitConfig();
+    {
-            public abstract void LoadFromGrid();
+        SimConfig GetConfigObject();
-            public abstract World LoadWorld();
+    }
-            public abstract void SaveMap();
-                
-        }
-        
-        public interface ISimConfig
-        {
-                SimConfig GetConfigObject();
-        }
 }

diff --git a/src/Config.cs b/OpenSim.Framework/IConfig.cs index 1c0a6cc..ca7f645 100644 --- a/src/Config.cs +++ b/OpenSim.Framework/IConfig.cs
@@ -31,49 +31,48 @@ using System;
31	using System.Collections.Generic;	31	using System.Collections.Generic;
32	using System.IO;	32	using System.IO;
33	using libsecondlife;	33	using libsecondlife;
34	using OpenSim.world;	34	//using OpenSim.world;
35		35
36	namespace OpenSim	36	namespace OpenSim.Framework.Interfaces
37	{	37	{
38	/// <summary>	38	/// <summary>
39	/// This class handles connection to the underlying database used for configuration of the region.	39	/// This class handles connection to the underlying database used for configuration of the region.
40	/// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate	40	/// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate
41	/// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from	41	/// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from
42	/// what is hardcoded here and then saved into opensim.yap for future startups.	42	/// what is hardcoded here and then saved into opensim.yap for future startups.
43	/// </summary>	43	/// </summary>
44		44
45		45
46	public abstract class SimConfig	46	public abstract class SimConfig
47	{	47	{
48	public string RegionName;	48	public string RegionName;
49		49
50	public uint RegionLocX;	50	public uint RegionLocX;
51	public uint RegionLocY;	51	public uint RegionLocY;
52	public ulong RegionHandle;	52	public ulong RegionHandle;
53		53
54	public int IPListenPort;	54	public int IPListenPort;
55	public string IPListenAddr;	55	public string IPListenAddr;
56		56
57	public string AssetURL;	57	public string AssetURL;
58	public string AssetSendKey;	58	public string AssetSendKey;
59		59
60	public string GridURL;	60	public string GridURL;
61	public string GridSendKey;	61	public string GridSendKey;
62	public string GridRecvKey;	62	public string GridRecvKey;
63	public string UserURL;	63	public string UserURL;
64	public string UserSendKey;	64	public string UserSendKey;
65	public string UserRecvKey;	65	public string UserRecvKey;
		66
		67	public abstract void InitConfig(bool sandboxMode);
		68	public abstract void LoadFromGrid();
		69	public abstract float[] LoadWorld();
		70	public abstract void SaveMap(float[] heightmap);
		71
		72	}
66		73
67		74	public interface ISimConfig
68	public abstract void InitConfig();	75	{
69	public abstract void LoadFromGrid();	76	SimConfig GetConfigObject();
70	public abstract World LoadWorld();	77	}
71	public abstract void SaveMap();
72
73	}
74
75	public interface ISimConfig
76	{
77	SimConfig GetConfigObject();
78	}
79	}	78	}