Should allow multiple worlds (and UDP servers) to be ran in one instance, just missing backend comms and working Avatar/primitives classes.

14 files changed, 88 insertions, 77 deletions

diff --git a/Common/OpenSim.Framework/Interfaces/IGenericConfig.cs b/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/Common/OpenSim.Framework/Interfaces/IGenericConfig.cs
+++ b/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IGridConfig.cs b/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/Common/OpenSim.Framework/Interfaces/IGridConfig.cs
+++ b/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IUserConfig.cs b/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
index e15867d..e15867d 100644
--- a/Common/OpenSim.Framework/Interfaces/IUserConfig.cs
+++ b/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index b6ae232..add6c00 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Framework.Interfaces
         event StartAnim OnStartAnim;

         event LinkObjects OnLinkObjects;

         event GenericCall4 OnDeRezObject;

-        event ModifyTerrain OnModifyTerrain;

         event GenericCall OnRegionHandShakeReply;

         event GenericCall OnRequestWearables;

         event GenericCall2 OnCompleteMovementToRegion;

@@ -57,6 +56,13 @@ namespace OpenSim.Framework.Interfaces
             get;

             set;

         }

+

+        LLUUID AgentId

+        {

+            get;

+        }

+

+        void OutPacket(Packet newPack);

         void SendAppearance(AvatarWearable[] wearables);

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

     }

diff --git a/Common/OpenSim.Framework/Interfaces/IConfig.cs b/Common/OpenSim.Framework/Interfaces/IConfig.cs
deleted file mode 100644
index 7b4c040..0000000
--- a/Common/OpenSim.Framework/Interfaces/IConfig.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*

-Copyright (c) OpenSim project, http://osgrid.org/

-

-* Copyright (c) <year>, <copyright holder>

-* All rights reserved.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the <organization> nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-using System;

-using System.Collections.Generic;

-using System.IO;

-using libsecondlife;

-//using OpenSim.world;

-

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

-

-        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 abstract void InitConfig(bool sandboxMode);

-        public abstract void LoadFromGrid(); 

-

-    }

-

-    public interface ISimConfig

-    {

-        SimConfig GetConfigObject();

-    }

-}

diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
new file mode 100644
index 0000000..433e540
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -0,0 +1,15 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+using OpenSim.Framework.Types;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public interface IWorld

+    {

+        bool AddNewAvatar(IClientAPI remoteClient, bool childAgent);

+        bool RemoveAvatar(LLUUID agentID);

+        RegionInfo GetRegionInfo();

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/Remoting/IGridServerHost.cs b/Common/OpenSim.Framework/Interfaces/Remoting/IGridServerHost.cs
new file mode 100644
index 0000000..1569cb2
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/Remoting/IGridServerHost.cs
@@ -0,0 +1,12 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public interface IGridServerHost

+    {

+        void ConnectSim(string name);

+        string RequestSimURL(uint regionHandle);

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/Remoting/IProxyServerClient.cs b/Common/OpenSim.Framework/Interfaces/Remoting/IProxyServerClient.cs
new file mode 100644
index 0000000..b58bcba
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/Remoting/IProxyServerClient.cs
@@ -0,0 +1,10 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public interface IProxyServerClient

+    {

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/Remoting/IProxyServerHost.cs b/Common/OpenSim.Framework/Interfaces/Remoting/IProxyServerHost.cs
new file mode 100644
index 0000000..381d53b
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/Remoting/IProxyServerHost.cs
@@ -0,0 +1,10 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public interface IProxyServerHost

+    {

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/Remoting/IRegionGridClient.cs b/Common/OpenSim.Framework/Interfaces/Remoting/IRegionGridClient.cs
new file mode 100644
index 0000000..7f8ecaf
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/Remoting/IRegionGridClient.cs
@@ -0,0 +1,11 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public interface IRegionGridClient

+    {

+        bool ExpectUser(string toRegionID, string name);

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/Remoting/IRegionSimHost.cs b/Common/OpenSim.Framework/Interfaces/Remoting/IRegionSimHost.cs
new file mode 100644
index 0000000..c22fe29
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/Remoting/IRegionSimHost.cs
@@ -0,0 +1,12 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public interface IRegionSimHost

+    {

+        bool ExpectUser(string name);

+        bool AgentCrossing(string name);

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/Remoting/RegionGridClientBase.cs b/Common/OpenSim.Framework/Interfaces/Remoting/RegionGridClientBase.cs
new file mode 100644
index 0000000..28b3128
--- /dev/null
+++ b/Common/OpenSim.Framework/Interfaces/Remoting/RegionGridClientBase.cs
@@ -0,0 +1,11 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public abstract class RegionGridClientBase :IRegionGridClient

+    {

+        public abstract bool ExpectUser(string toRegionID, string name);

+    }

+}

diff --git a/Common/OpenSim.Framework/Interfaces/IScriptAPI.cs b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
index 3ad0f06..3ad0f06 100644
--- a/Common/OpenSim.Framework/Interfaces/IScriptAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IScriptEngine.cs b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/Common/OpenSim.Framework/Interfaces/IScriptEngine.cs
+++ b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs