aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications/CommunicationsManager.cs (renamed from Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs)10
-rw-r--r--Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs68
-rw-r--r--Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs63
-rw-r--r--Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs53
-rw-r--r--Common/OpenGrid.Framework.Communications/IGridServices.cs (renamed from Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs)15
-rw-r--r--Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs (renamed from Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs)8
-rw-r--r--Common/OpenGrid.Framework.Communications/IUserServices.cs (renamed from Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs)8
-rw-r--r--Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs48
-rw-r--r--Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs61
-rw-r--r--Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs48
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj35
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build17
-rw-r--r--Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs57
-rw-r--r--OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs (renamed from Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs)16
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs (renamed from Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs)18
15 files changed, 49 insertions, 476 deletions
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
index 66ce3e2..10fe251 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
@@ -37,13 +37,13 @@ using libsecondlife;
37namespace OpenGrid.Framework.Communications 37namespace OpenGrid.Framework.Communications
38{ 38{
39 39
40 public class RegionServerCommsManager 40 public class CommunicationsManager
41 { 41 {
42 public UserServer.UserCommsManagerBase UserServer; 42 public IUserServices UserServer;
43 public GridServer.GridCommsManagerBase GridServer; 43 public IGridServices GridServer;
44 public InterSimsCommsBase InterSims; 44 public IInterRegionCommunications InterSims;
45 45
46 public RegionServerCommsManager() 46 public CommunicationsManager()
47 { 47 {
48 48
49 } 49 }
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
deleted file mode 100644
index 357321d..0000000
--- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Types;
33using OpenSim.Framework;
34
35namespace OpenGrid.Framework.Communications.GridServer
36{
37 public class GridCommsManagerBase
38 {
39 public GridCommsManagerBase()
40 {
41 }
42 /// <summary>
43 ///
44 /// </summary>
45 /// <param name="regionInfo"></param>
46 /// <returns></returns>
47 public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
48 {
49 return null;
50 }
51
52 /// <summary>
53 ///
54 /// </summary>
55 /// <param name="regionInfo"></param>
56 /// <returns></returns>
57 public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
58 {
59 return null;
60 }
61
62 public virtual RegionInfo RequestNeighbourInfo(ulong regionHandle)
63 {
64 return null;
65 }
66
67 }
68}
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
deleted file mode 100644
index 3c1c29b..0000000
--- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
+++ /dev/null
@@ -1,63 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Framework;
33using OpenSim.Framework.Types;
34
35using libsecondlife;
36
37namespace OpenGrid.Framework.Communications.GridServer
38{
39 public class GridCommsManagerLocal : GridCommsManagerBase
40 {
41 private LocalBackEndServices sandBoxManager;
42
43 public GridCommsManagerLocal(LocalBackEndServices sandManager)
44 {
45 sandBoxManager = sandManager;
46 }
47
48 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
49 {
50 return sandBoxManager.RegisterRegion(regionInfo);
51 }
52
53 public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
54 {
55 return sandBoxManager.RequestNeighbours(regionInfo);
56 }
57
58 public override RegionInfo RequestNeighbourInfo(ulong regionHandle)
59 {
60 return sandBoxManager.RequestNeighbourInfo(regionHandle);
61 }
62 }
63}
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
deleted file mode 100644
index 07ee935..0000000
--- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
+++ /dev/null
@@ -1,53 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Framework;
33using OpenSim.Framework.Types;
34
35namespace OpenGrid.Framework.Communications.GridServer
36{
37 public class GridCommsManagerOGS : GridCommsManagerBase
38 {
39 public GridCommsManagerOGS()
40 {
41 }
42
43 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
44 {
45 return null;
46 }
47
48 public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
49 {
50 return null;
51 }
52 }
53}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/IGridServices.cs
index bd00a14..9466647 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
+++ b/Common/OpenGrid.Framework.Communications/IGridServices.cs
@@ -25,22 +25,19 @@
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*/
28
28using System; 29using System;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Text; 31using System.Text;
31using OpenSim.Framework;
32using OpenSim.Framework.Types; 32using OpenSim.Framework.Types;
33using OpenSim.Framework;
33 34
34namespace OpenGrid.Framework.Communications 35namespace OpenGrid.Framework.Communications
35{ 36{
36 public class RegionServerCommsOGS : RegionServerCommsManager 37 public interface IGridServices
37 { 38 {
38 public RegionServerCommsOGS() 39 RegionCommsHostBase RegisterRegion(RegionInfo regionInfo);
39 { 40 List<RegionInfo> RequestNeighbours(RegionInfo regionInfo);
40 UserServer = new UserServer.UserCommsManagerOGS(); //Remote User Server 41 RegionInfo RequestNeighbourInfo(ulong regionHandle);
41 GridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server
42 InterSims = new InterSimsCommsOGS();
43 }
44
45 } 42 }
46} 43}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
index 1d6a0aa..27e6fc7 100644
--- a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
+++ b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
@@ -28,10 +28,14 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Framework.Types;
32using OpenSim.Framework;
31 33
32namespace OpenGrid.Framework.Communications.UserServer 34namespace OpenGrid.Framework.Communications
33{ 35{
34 public class UserCommsManagerLocal : UserCommsManagerBase 36 public interface IInterRegionCommunications
35 { 37 {
38 bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
39 bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
36 } 40 }
37} 41}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/IUserServices.cs
index 615bb2d..9eed195 100644
--- a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
+++ b/Common/OpenGrid.Framework.Communications/IUserServices.cs
@@ -28,10 +28,14 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife;
31 32
32namespace OpenGrid.Framework.Communications.UserServer 33namespace OpenGrid.Framework.Communications
33{ 34{
34 public class UserCommsManagerOGS : UserCommsManagerBase 35 public interface IUserServices
35 { 36 {
37 void GetUserProfile(string name);
38 void GetUserProfile(LLUUID avatar_id); //should be returning UserProfile
39
36 } 40 }
37} 41}
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs
deleted file mode 100644
index 50335c5..0000000
--- a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs
+++ /dev/null
@@ -1,48 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Types;
32using OpenSim.Framework;
33
34namespace OpenGrid.Framework.Communications
35{
36 public abstract class InterSimsCommsBase
37 {
38 /// <summary>
39 /// Informs a neighbouring sim to expect a child agent
40 /// </summary>
41 /// <param name="regionHandle"></param>
42 /// <param name="agentData"></param>
43 /// <returns></returns>
44 public abstract bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
45 public abstract bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
46
47 }
48}
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs
deleted file mode 100644
index d70376c..0000000
--- a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs
+++ /dev/null
@@ -1,61 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Types;
32using OpenSim.Framework;
33
34namespace OpenGrid.Framework.Communications
35{
36 public class InterSimsCommsLocal : InterSimsCommsBase
37 {
38 private LocalBackEndServices sandBoxManager;
39
40 public InterSimsCommsLocal(LocalBackEndServices sandManager)
41 {
42 sandBoxManager = sandManager;
43 }
44
45 /// <summary>
46 /// Informs a neighbouring sim to expect a child agent
47 /// </summary>
48 /// <param name="regionHandle"></param>
49 /// <param name="agentData"></param>
50 /// <returns></returns>
51 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
52 {
53 return sandBoxManager.InformNeighbourOfChildAgent(regionHandle, agentData);
54 }
55
56 public override bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
57 {
58 return sandBoxManager.ExpectAvatarCrossing(regionHandle, agentID, position);
59 }
60 }
61}
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs
deleted file mode 100644
index e631cf4..0000000
--- a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs
+++ /dev/null
@@ -1,48 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Types;
32using OpenSim.Framework;
33
34namespace OpenGrid.Framework.Communications
35{
36 public class InterSimsCommsOGS : InterSimsCommsBase
37 {
38 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
39 {
40 return false;
41 }
42
43 public override bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
44 {
45 return false;
46 }
47 }
48}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 75c6130..0206201 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -80,48 +80,21 @@
80 </ProjectReference> 80 </ProjectReference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <Compile Include="LocalBackEndServices.cs"> 83 <Compile Include="CommunicationsManager.cs">
84 <SubType>Code</SubType> 84 <SubType>Code</SubType>
85 </Compile> 85 </Compile>
86 <Compile Include="RegionServerCommsLocal.cs"> 86 <Compile Include="IGridServices.cs">
87 <SubType>Code</SubType> 87 <SubType>Code</SubType>
88 </Compile> 88 </Compile>
89 <Compile Include="RegionServerCommsManager.cs"> 89 <Compile Include="IInterRegionCommunications.cs">
90 <SubType>Code</SubType> 90 <SubType>Code</SubType>
91 </Compile> 91 </Compile>
92 <Compile Include="RegionServerCommsOGS.cs"> 92 <Compile Include="IUserServices.cs">
93 <SubType>Code</SubType>
94 </Compile>
95 <Compile Include="GridServer\GridCommsManagerBase.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="GridServer\GridCommsManagerLocal.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 <Compile Include="GridServer\GridCommsManagerOGS.cs">
102 <SubType>Code</SubType>
103 </Compile>
104 <Compile Include="InterSimComms\InterSimsCommsBase.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="InterSimComms\InterSimsCommsLocal.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="InterSimComms\InterSimsCommsOGS.cs">
111 <SubType>Code</SubType> 93 <SubType>Code</SubType>
112 </Compile> 94 </Compile>
113 <Compile Include="Properties\AssemblyInfo.cs"> 95 <Compile Include="Properties\AssemblyInfo.cs">
114 <SubType>Code</SubType> 96 <SubType>Code</SubType>
115 </Compile> 97 </Compile>
116 <Compile Include="UserServer\UserCommsManagerBase.cs">
117 <SubType>Code</SubType>
118 </Compile>
119 <Compile Include="UserServer\UserCommsManagerLocal.cs">
120 <SubType>Code</SubType>
121 </Compile>
122 <Compile Include="UserServer\UserCommsManagerOGS.cs">
123 <SubType>Code</SubType>
124 </Compile>
125 </ItemGroup> 98 </ItemGroup>
126 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 99 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
127 <PropertyGroup> 100 <PropertyGroup>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index 9c5ba30..fbb627c 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -11,20 +11,11 @@
11 <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > 11 <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="LocalBackEndServices.cs" /> 14 <include name="CommunicationsManager.cs" />
15 <include name="RegionServerCommsLocal.cs" /> 15 <include name="IGridServices.cs" />
16 <include name="RegionServerCommsManager.cs" /> 16 <include name="IInterRegionCommunications.cs" />
17 <include name="RegionServerCommsOGS.cs" /> 17 <include name="IUserServices.cs" />
18 <include name="GridServer/GridCommsManagerBase.cs" />
19 <include name="GridServer/GridCommsManagerLocal.cs" />
20 <include name="GridServer/GridCommsManagerOGS.cs" />
21 <include name="InterSimComms/InterSimsCommsBase.cs" />
22 <include name="InterSimComms/InterSimsCommsLocal.cs" />
23 <include name="InterSimComms/InterSimsCommsOGS.cs" />
24 <include name="Properties/AssemblyInfo.cs" /> 18 <include name="Properties/AssemblyInfo.cs" />
25 <include name="UserServer/UserCommsManagerBase.cs" />
26 <include name="UserServer/UserCommsManagerLocal.cs" />
27 <include name="UserServer/UserCommsManagerOGS.cs" />
28 </sources> 19 </sources>
29 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
30 <lib> 21 <lib>
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
deleted file mode 100644
index 623dc42..0000000
--- a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
+++ /dev/null
@@ -1,57 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife;
33namespace OpenGrid.Framework.Communications.UserServer
34{
35 public class UserCommsManagerBase
36 {
37 public UserCommsManagerBase()
38 {
39 }
40
41 public virtual UserProfileData GetUserProfile(string name)
42 {
43 return null;
44 }
45 public virtual UserProfileData GetUserProfile(LLUUID avatar_id)
46 {
47 return null;
48 }
49 }
50
51 public class UserProfileData
52 {
53 public UserProfileData()
54 {
55 }
56 }
57}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
index 052d405..1cb5f6f 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
+++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
@@ -33,19 +33,19 @@ using libsecondlife;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenGrid.Framework.Communications;
36 37
37namespace OpenGrid.Framework.Communications 38namespace OpenSim.LocalCommunications
38{ 39{
39 public class RegionServerCommsLocal : RegionServerCommsManager 40 public class CommunicationsLocal : CommunicationsManager
40 { 41 {
41 public LocalBackEndServices SandManager = new LocalBackEndServices(); 42 public LocalBackEndServices SandManager = new LocalBackEndServices();
42 public RegionServerCommsLocal() 43
44 public CommunicationsLocal()
43 { 45 {
44 UserServer = new UserServer.UserCommsManagerLocal(); //Local User Server 46 UserServer = null;
45 GridServer = new GridServer.GridCommsManagerLocal(SandManager); //Locl Grid Server 47 GridServer = SandManager;
46 InterSims = new InterSimsCommsLocal(SandManager); 48 InterSims = SandManager;
47 } 49 }
48
49
50 } 50 }
51} 51}
diff --git a/Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
index 928215e..dfc4505 100644
--- a/Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs
+++ b/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
@@ -25,18 +25,19 @@
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*/
28
29using System; 28using System;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text; 30using System.Text;
32using OpenSim.Framework; 31using OpenGrid.Framework.Communications;
33using OpenSim.Framework.Types;
34
35using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Types;
34using OpenSim.Framework;
36 35
37namespace OpenGrid.Framework.Communications 36namespace OpenSim.LocalCommunications
38{ 37{
39 public class LocalBackEndServices 38
39
40 public class LocalBackEndServices : IGridServices, IInterRegionCommunications
40 { 41 {
41 protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>(); 42 protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
42 protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>(); 43 protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();
@@ -72,7 +73,7 @@ namespace OpenGrid.Framework.Communications
72 /// </summary> 73 /// </summary>
73 /// <param name="regionInfo"></param> 74 /// <param name="regionInfo"></param>
74 /// <returns></returns> 75 /// <returns></returns>
75 public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo) 76 public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
76 { 77 {
77 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle); 78 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
78 List<RegionInfo> neighbours = new List<RegionInfo>(); 79 List<RegionInfo> neighbours = new List<RegionInfo>();
@@ -114,7 +115,7 @@ namespace OpenGrid.Framework.Communications
114 /// <param name="regionHandle"></param> 115 /// <param name="regionHandle"></param>
115 /// <param name="agentData"></param> 116 /// <param name="agentData"></param>
116 /// <returns></returns> 117 /// <returns></returns>
117 public bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData 118 public bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
118 { 119 {
119 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); 120 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
120 if (this.regionHosts.ContainsKey(regionHandle)) 121 if (this.regionHosts.ContainsKey(regionHandle))
@@ -175,3 +176,4 @@ namespace OpenGrid.Framework.Communications
175 } 176 }
176 } 177 }
177} 178}
179
generated by cgit v1.1 at 2024-12-21 01:32:47 +0000