aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs26
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs11
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs2
5 files changed, 21 insertions, 32 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 870f577..0a0847e 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -1,8 +1,6 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenSim.Framework.Communications; 1using OpenSim.Framework.Communications;
2using OpenSim.Framework.Types;
3
6namespace OpenSim.Region.Communications.OGS1 4namespace OpenSim.Region.Communications.OGS1
7{ 5{
8 public class CommunicationsOGS1 : CommunicationsManager 6 public class CommunicationsOGS1 : CommunicationsManager
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 977b131..1706c6d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1,19 +1,17 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Collections; 2using System.Collections;
4using System.Text; 3using System.Collections.Generic;
4using System.Net;
5using System.Runtime.Remoting; 5using System.Runtime.Remoting;
6using System.Runtime.Remoting.Channels; 6using System.Runtime.Remoting.Channels;
7using System.Runtime.Remoting.Channels.Tcp; 7using System.Runtime.Remoting.Channels.Tcp;
8 8using libsecondlife;
9using OpenSim.Framework.Servers; 9using Nwc.XmlRpc;
10using OpenSim.Framework; 10using OpenSim.Framework;
11using OpenSim.Framework.Types;
12using OpenSim.Framework.Communications; 11using OpenSim.Framework.Communications;
13 12using OpenSim.Framework.Console;
14using Nwc.XmlRpc; 13using OpenSim.Framework.Servers;
15using libsecondlife; 14using OpenSim.Framework.Types;
16using System.Net;
17 15
18namespace OpenSim.Region.Communications.OGS1 16namespace OpenSim.Region.Communications.OGS1
19{ 17{
@@ -52,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
52 if (GridRespData.ContainsKey("error")) 50 if (GridRespData.ContainsKey("error"))
53 { 51 {
54 string errorstring = (string)GridRespData["error"]; 52 string errorstring = (string)GridRespData["error"];
55 OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring); 53 MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
56 return null; 54 return null;
57 } 55 }
58 56
@@ -103,7 +101,7 @@ namespace OpenSim.Region.Communications.OGS1
103 101
104 public RegionInfo RequestNeighbourInfo(ulong regionHandle) 102 public RegionInfo RequestNeighbourInfo(ulong regionHandle)
105 { 103 {
106 OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()"); 104 MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
107 return null; 105 return null;
108 } 106 }
109 107
@@ -184,7 +182,7 @@ namespace OpenSim.Region.Communications.OGS1
184 } 182 }
185 else 183 else
186 { 184 {
187 OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString()); 185 MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
188 } 186 }
189 187
190 return new XmlRpcResponse(); 188 return new XmlRpcResponse();
@@ -215,7 +213,7 @@ namespace OpenSim.Region.Communications.OGS1
215 return false; 213 return false;
216 } 214 }
217 215
218 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 216 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
219 { 217 {
220 if (this.listeners.ContainsKey(regionHandle)) 218 if (this.listeners.ContainsKey(regionHandle))
221 { 219 {
@@ -239,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1
239 return false; 237 return false;
240 } 238 }
241 239
242 public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 240 public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)
243 { 241 {
244 if (this.listeners.ContainsKey(regionHandle)) 242 if (this.listeners.ContainsKey(regionHandle))
245 { 243 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 51b33e9..f514a29 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -1,12 +1,11 @@
1using System; 1using System;
2using System.Collections.Generic; 2using libsecondlife;
3using System.Text;
4using OpenSim.Framework.Types; 3using OpenSim.Framework.Types;
5using OpenSim.Framework.Communications; 4
6namespace OpenSim.Region.Communications.OGS1 5namespace OpenSim.Region.Communications.OGS1
7{ 6{
8 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); 7 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
9 public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 8 public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position);
10 9
11 public sealed class InterRegionSingleton 10 public sealed class InterRegionSingleton
12 { 11 {
@@ -40,7 +39,7 @@ namespace OpenSim.Region.Communications.OGS1
40 return false; 39 return false;
41 } 40 }
42 41
43 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 42 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
44 { 43 {
45 if (OnArrival != null) 44 if (OnArrival != null)
46 { 45 {
@@ -62,7 +61,7 @@ namespace OpenSim.Region.Communications.OGS1
62 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); 61 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
63 } 62 }
64 63
65 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 64 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
66 { 65 {
67 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position); 66 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
68 } 67 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 6d428d0..7c7db03 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -1,13 +1,9 @@
1using System; 1using System;
2using System.Collections; 2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5using OpenSim.Framework.Types;
6using OpenSim.Framework.Communications;
7using OpenSim.Framework.Data;
8using libsecondlife; 3using libsecondlife;
9
10using Nwc.XmlRpc; 4using Nwc.XmlRpc;
5using OpenSim.Framework.Communications;
6using OpenSim.Framework.Data;
11 7
12namespace OpenSim.Region.Communications.OGS1 8namespace OpenSim.Region.Communications.OGS1
13{ 9{
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 0c6f965..41f811a 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// associated with an assembly.