aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs26
1 files changed, 12 insertions, 14 deletions
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 {