aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2007-07-17 23:47:45 +0000
committerAdam Frisby2007-07-17 23:47:45 +0000
commitf65808ab07e708cbbc9c970f9a97ef691bb91bdb (patch)
tree564668d69d64e864f50f13ea3e84a3069dc9fa7b /OpenSim/Region
parent* More LSL related fun (diff)
downloadopensim-SC_OLD-f65808ab07e708cbbc9c970f9a97ef691bb91bdb.zip
opensim-SC_OLD-f65808ab07e708cbbc9c970f9a97ef691bb91bdb.tar.gz
opensim-SC_OLD-f65808ab07e708cbbc9c970f9a97ef691bb91bdb.tar.bz2
opensim-SC_OLD-f65808ab07e708cbbc9c970f9a97ef691bb91bdb.tar.xz
* More LSL changes (and fixing a compile warning)
* More attempted fixes for the phantom remoting bug.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs13
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs2
2 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index ce46043..a859826 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -444,10 +444,17 @@ namespace OpenSim.Region.Communications.OGS1
444 /// <returns></returns> 444 /// <returns></returns>
445 public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position) 445 public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)
446 { 446 {
447 if (this.listeners.ContainsKey(regionHandle)) 447 try
448 { 448 {
449 this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position); 449 if (this.listeners.ContainsKey(regionHandle))
450 return true; 450 {
451 this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
452 return true;
453 }
454 }
455 catch (System.Runtime.Remoting.RemotingException e)
456 {
457 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
451 } 458 }
452 return false; 459 return false;
453 } 460 }
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs
index 982cd65..6ef968b 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Scripting
136 public Key osAvatarOnSitTarget() 136 public Key osAvatarOnSitTarget()
137 { 137 {
138 //TODO: Follow this as Children is chanced to be of type entity to support ScenePresences 138 //TODO: Follow this as Children is chanced to be of type entity to support ScenePresences
139 foreach (KeyValuePair<Key, Primitive> Child in Task.Children) 139 foreach (KeyValuePair<Key, EntityBase> Child in Task.Children)
140 { 140 {
141 if (Child.Value is ScenePresence) 141 if (Child.Value is ScenePresence)
142 { 142 {