brought zircon branch into trunk

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>

-        /// 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

-        /// 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.

-        /// </summary>

-        

-        

-        public abstract class SimConfig

-        {

-                public string RegionName;

-                

-                public uint RegionLocX;

-                public uint RegionLocY;

-                public ulong RegionHandle;

-                

-                public int IPListenPort;

-                public string IPListenAddr;

-                

+    /// <summary>

+    /// 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

+    /// 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.

+    /// </summary>

+

+

+    public abstract class SimConfig

+    {

+        public string RegionName;

+

+        public uint RegionLocX;

+        public uint RegionLocY;

+        public ulong RegionHandle;

+

+        public int IPListenPort;

+        public string IPListenAddr;

+

         public string AssetURL;

-            public string AssetSendKey;

-                

-            public string GridURL;

-            public string GridSendKey;

-            public string GridRecvKey;

-            public string UserURL;

-            public string UserSendKey;

-            public string UserRecvKey;

+        public string AssetSendKey;

+

+        public string GridURL;

+        public string GridSendKey;

+        public string GridRecvKey;

+        public string UserURL;

+        public string UserSendKey;

+        public string UserRecvKey;

+

+        public abstract void InitConfig(bool sandboxMode);

+        public abstract void LoadFromGrid(); 

+        public abstract float[] LoadWorld();

+        public abstract void SaveMap(float[] heightmap);

+

+    }

 

-        

-            public abstract void InitConfig();

-            public abstract void LoadFromGrid();

-            public abstract World LoadWorld();

-            public abstract void SaveMap();

-                

-        }

-        

-        public interface ISimConfig

-        {

-                SimConfig GetConfigObject();

-        }

+    public interface ISimConfig

+    {

+        SimConfig GetConfigObject();

+    }

 }