* More LSL changes (and fixing a compile warning)

* More attempted fixes for the phantom remoting bug.

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
         /// <returns></returns>
         public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)
         {
-            if (this.listeners.ContainsKey(regionHandle))
+            try
             {
-                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
-                return true;
+                if (this.listeners.ContainsKey(regionHandle))
+                {
+                    this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                    return true;
+                }
+            }
+            catch (System.Runtime.Remoting.RemotingException e)
+            {
+                MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
             }
             return false;
         }
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
         public Key osAvatarOnSitTarget()
         {
             //TODO: Follow this as Children is chanced to be of type entity to support ScenePresences
-            foreach (KeyValuePair<Key, Primitive> Child in Task.Children)
+            foreach (KeyValuePair<Key, EntityBase> Child in Task.Children)
             {
                 if (Child.Value is ScenePresence)
                 {