Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

3 files changed, 21 insertions, 13 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6274e02..a2322b7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3395,10 +3395,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// also return a reason.</returns>
         public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup)
         {
-            bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 ||
-                             (teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0);
-            bool viahome = ((teleportFlags & (uint)Constants.TeleportFlags.ViaHome) != 0);
-            bool godlike = ((teleportFlags & (uint)Constants.TeleportFlags.Godlike) != 0);
+            bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 ||
+                             (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
+            bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0);
+            bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0);
 
             reason = String.Empty;
 
@@ -3411,9 +3411,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Don't disable this log message - it's too helpful
             m_log.DebugFormat(
-                "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags {8}, position {9})",
+                "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
                 RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname,
-                agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, teleportFlags, agent.startpos);
+                agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, ((TPFlags)teleportFlags).ToString(), agent.startpos);
 
             if (LoginsDisabled)
             {
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 27833e8..a3dd53e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -140,6 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
             icon.EndInvoke(iar);
         }
 
+        ExpiringCache<string, bool> _failedSims = new ExpiringCache<string, bool>();
         public void SendChildAgentDataUpdate(AgentPosition cAgentData, ScenePresence presence)
         {
             // This assumes that we know what our neighbors are.
@@ -156,16 +157,22 @@ namespace OpenSim.Region.Framework.Scenes
                         // that the region position is cached or performance will degrade
                         Utils.LongToUInts(regionHandle, out x, out y);
                         GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
-                        if (! simulatorList.Contains(dest.ServerURI))
+                        bool v = true;
+                        if (! simulatorList.Contains(dest.ServerURI) && !_failedSims.TryGetValue(dest.ServerURI, out v))
                         {
                             // we havent seen this simulator before, add it to the list
                             // and send it an update
                             simulatorList.Add(dest.ServerURI);
-
-                            SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
-                            d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, dest,
-                                          SendChildAgentDataUpdateCompleted,
-                                          d);
+                            // Let move this to sync. Mono definitely does not like async networking.
+                            if (!m_scene.SimulationService.UpdateAgent(dest, cAgentData))
+                                // Also if it fails, get it out of the loop for a bit
+                                _failedSims.Add(dest.ServerURI, true, 120);
+
+                            // Leaving this here as a reminder that we tried, and it sucks.
+                            //SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
+                            //d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, dest,
+                            //              SendChildAgentDataUpdateCompleted,
+                            //              d);
                         }
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8a42616..b38523f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2787,7 +2787,8 @@ namespace OpenSim.Region.Framework.Scenes
                 AgentPosition agentpos = new AgentPosition();
                 agentpos.CopyFrom(cadu);
 
-                m_scene.SendOutChildAgentUpdates(agentpos, this);
+                // Let's get this out of the update loop
+                Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); });
             }
         }