diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 13a37dd..317a0ba 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -354,7 +354,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
354 | "tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions"); | 354 | "tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions"); |
355 | if (remObject != null) | 355 | if (remObject != null) |
356 | { | 356 | { |
357 | |||
358 | retValue = remObject.InformRegionOfChildAgent(regionHandle, agentData); | 357 | retValue = remObject.InformRegionOfChildAgent(regionHandle, agentData); |
359 | } | 358 | } |
360 | else | 359 | else |
@@ -396,14 +395,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
396 | if (regInfo != null) | 395 | if (regInfo != null) |
397 | { | 396 | { |
398 | bool retValue = false; | 397 | bool retValue = false; |
399 | |||
400 | |||
401 | OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject( | 398 | OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject( |
402 | typeof(OGS1InterRegionRemoting), | 399 | typeof(OGS1InterRegionRemoting), |
403 | "tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions"); | 400 | "tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions"); |
404 | if (remObject != null) | 401 | if (remObject != null) |
405 | { | 402 | { |
406 | |||
407 | retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position); | 403 | retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position); |
408 | } | 404 | } |
409 | else | 405 | else |
@@ -412,7 +408,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
412 | } | 408 | } |
413 | remObject = null; | 409 | remObject = null; |
414 | 410 | ||
415 | |||
416 | return retValue; | 411 | return retValue; |
417 | } | 412 | } |
418 | //TODO need to see if we know about where this region is and use .net remoting | 413 | //TODO need to see if we know about where this region is and use .net remoting |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 0847148..a1f31bb 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -69,7 +69,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
69 | { | 69 | { |
70 | try | 70 | try |
71 | { | 71 | { |
72 | |||
73 | Hashtable param = new Hashtable(); | 72 | Hashtable param = new Hashtable(); |
74 | param["avatar_uuid"] = avatarID.ToString(); | 73 | param["avatar_uuid"] = avatarID.ToString(); |
75 | IList parameters = new ArrayList(); | 74 | IList parameters = new ArrayList(); |