diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs new file mode 100644 index 0000000000..972506fec0 --- /dev/null +++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim.Framework.Types; +using OpenSim.Framework; + +namespace OpenGrid.Framework.Communications +{ + public abstract class InterSimsCommsBase + { + /// + /// Informs a neighbouring sim to expect a child agent + /// + /// + /// + /// + public abstract bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData); + } +} diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs new file mode 100644 index 0000000000..bce146fa08 --- /dev/null +++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim.Framework.Types; +using OpenSim.Framework; + +namespace OpenGrid.Framework.Communications +{ + public class InterSimsCommsLocal : InterSimsCommsBase + { + private SandBoxManager sandBoxManager; + + public InterSimsCommsLocal(SandBoxManager sandManager) + { + sandBoxManager = sandManager; + } + + /// + /// Informs a neighbouring sim to expect a child agent + /// + /// + /// + /// + public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData + { + return sandBoxManager.InformNeighbourOfChildAgent(regionHandle, agentData); + } + } +} diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs new file mode 100644 index 0000000000..b6e98da6c4 --- /dev/null +++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim.Framework.Types; +using OpenSim.Framework; + +namespace OpenGrid.Framework.Communications +{ + public class InterSimsCommsOGS : InterSimsCommsBase + { + public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData + { + return false; + } + } +} diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index 21a0cd75cf..e8f10f01bb 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {683344D5-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenGrid.Framework.Communications @@ -16,11 +15,9 @@ IE50 false Library - - + OpenGrid.Framework.Communications - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,20 +55,18 @@ False False 4 - - + - + System.dll False - - + System.Xml.dll False - + ..\..\bin\libsecondlife.dll False @@ -84,7 +76,7 @@ OpenSim.Framework {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -97,6 +89,9 @@ Code + + Code + Code @@ -106,10 +101,18 @@ Code + + Code + + + Code + + + Code + Code - Code @@ -127,4 +130,4 @@ - \ No newline at end of file + diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build index 952051bfb9..069983c9f4 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build @@ -18,6 +18,9 @@ + + + diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs index bfcd15ffb0..aeaeb7bb25 100644 --- a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs +++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs @@ -14,19 +14,11 @@ namespace OpenGrid.Framework.Communications public SandBoxManager SandManager = new SandBoxManager(); public RegionServerCommsLocal() { - userServer = new UserServer.UserCommsManagerLocal(); //Local User Server - gridServer = new GridServer.GridCommsManagerLocal(SandManager); //Locl Grid Server + UserServer = new UserServer.UserCommsManagerLocal(); //Local User Server + GridServer = new GridServer.GridCommsManagerLocal(SandManager); //Locl Grid Server + InterSims = new InterSimsCommsLocal(SandManager); } - /// - /// informs a neighbouring sim to expect a child agent - /// - /// - /// - /// - public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData - { - return SandManager.InformNeighbourOfChildAgent(regionHandle, agentData); - } + } } diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs index 810477a965..e48ac71d02 100644 --- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs +++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs @@ -12,17 +12,13 @@ namespace OpenGrid.Framework.Communications public class RegionServerCommsManager { - public UserServer.UserCommsManagerBase userServer; - public GridServer.GridCommsManagerBase gridServer; + public UserServer.UserCommsManagerBase UserServer; + public GridServer.GridCommsManagerBase GridServer; + public InterSimsCommsBase InterSims; public RegionServerCommsManager() { } - - public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData - { - return false; - } } } diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs index 75b211d5b0..02f17f0fc3 100644 --- a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs +++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs @@ -10,20 +10,10 @@ namespace OpenGrid.Framework.Communications { public RegionServerCommsOGS() { - userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server - gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server + UserServer = new UserServer.UserCommsManagerOGS(); //Remote User Server + GridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server + InterSims = new InterSimsCommsOGS(); } - - /// - /// informs a neighbouring sim to expect a child agent - /// - /// - /// - /// - public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData - { - return false; - } } } diff --git a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs b/Common/OpenGrid.Framework.Communications/SandBoxManager.cs index 4094658a36..dc2c3cbf70 100644 --- a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs +++ b/Common/OpenGrid.Framework.Communications/SandBoxManager.cs @@ -19,9 +19,7 @@ namespace OpenGrid.Framework.Communications } /// - /// Main Register a region method with the CommsManager. - /// Should do anything that is needed and also call the RegisterRegion method in the gridserver class - /// to inform the grid server (in grid mode). + /// Register a region method with the SandBoxManager. /// /// /// @@ -43,9 +41,6 @@ namespace OpenGrid.Framework.Communications } /// - /// In the current class structure this shouldn't be here as it should only be in the gridserver class - /// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out - /// it will have to be here as well /// /// /// @@ -73,9 +68,6 @@ namespace OpenGrid.Framework.Communications } /// - /// informs a neighbouring sim to expect a child agent - /// I guess if we are going to stick with the current class structure then we need a intersim class - /// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode /// /// /// diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs index cf0382a42c..aad09b3df0 100644 --- a/OpenSim/OpenSim.Region/World/World.cs +++ b/OpenSim/OpenSim.Region/World/World.cs @@ -544,7 +544,7 @@ namespace OpenSim.Region protected void InformClientOfNeighbours(IClientAPI remoteClient) { // Console.WriteLine("informing client of neighbouring regions"); - List neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo); + List neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo); //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); if (neighbours != null) @@ -556,7 +556,7 @@ namespace OpenSim.Region agent.BaseFolder = LLUUID.Zero; agent.InventoryFolder = LLUUID.Zero; agent.startpos = new LLVector3(128, 128, 70); - this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); + this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); } } @@ -617,7 +617,7 @@ namespace OpenSim.Region /// public void RegisterRegionWithComms() { - this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo); + this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo); if (this.regionCommsHost != null) { this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 04febf0903..59440e6ced 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {632E1BFD-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenSim.RegionServer @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.RegionServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,27 +55,26 @@ False False 4 - - + - + System.dll False - + System.Xml.dll False - + ..\..\bin\libsecondlife.dll False - + ..\..\bin\Axiom.MathLib.dll False - + ..\..\bin\Db4objects.Db4o.dll False @@ -91,43 +84,43 @@ OpenSim.Terrain.BasicTerrain {2270B8FE-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.GenericConfig.Xml {E88EF749-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Physics.Manager {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Servers {8BB20F0A-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False XMLRPC {8E81D43C-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -193,4 +186,4 @@ - \ No newline at end of file +