diff options
Some Rearranging of CommsManager.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs (renamed from Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs) | 18 |
1 files changed, 10 insertions, 8 deletions
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 | |||
29 | using System; | 28 | using System; |
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.Text; | 30 | using System.Text; |
32 | using OpenSim.Framework; | 31 | using OpenGrid.Framework.Communications; |
33 | using OpenSim.Framework.Types; | ||
34 | |||
35 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework.Types; | ||
34 | using OpenSim.Framework; | ||
36 | 35 | ||
37 | namespace OpenGrid.Framework.Communications | 36 | namespace 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 | |||