aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
diff options
context:
space:
mode:
authorMW2007-07-18 13:40:07 +0000
committerMW2007-07-18 13:40:07 +0000
commit04ece84d6b3aa442ed7413f23b0daa30ff6d3ee8 (patch)
treee457adc88cfa763d6e3fb3734b253f94b2aa775b /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
parent* Added a FileSystemObject to SimpleApp (diff)
downloadopensim-SC_OLD-04ece84d6b3aa442ed7413f23b0daa30ff6d3ee8.zip
opensim-SC_OLD-04ece84d6b3aa442ed7413f23b0daa30ff6d3ee8.tar.gz
opensim-SC_OLD-04ece84d6b3aa442ed7413f23b0daa30ff6d3ee8.tar.bz2
opensim-SC_OLD-04ece84d6b3aa442ed7413f23b0daa30ff6d3ee8.tar.xz
few small changes
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs5
1 files changed, 0 insertions, 5 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