Merge branch 'master' of /home/opensim/src/OpenSim/Core

4 files changed, 34 insertions, 22 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4fca261..355671c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -64,6 +64,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Fields
 
+        public bool EmergencyMonitoring = false;
+
         public SynchronizeSceneHandler SynchronizeScene;
         public SimStatsReporter StatsReporter;
         public List<Border> NorthBorders = new List<Border>();
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index f8ff308..837e655 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -193,7 +193,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, ulong regionHandle);
+        public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, GridRegion dest);
+        
 
         /// <summary>
         /// This informs all neighboring regions about the settings of it's child agent.
@@ -202,31 +203,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
         ///
         /// </summary>
-        private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, ulong regionHandle)
+        private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, GridRegion dest)
         {
             //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName);
             try
             {
-                //m_commsProvider.InterRegion.ChildAgentUpdate(regionHandle, cAgentData);
-                uint x = 0, y = 0;
-                Utils.LongToUInts(regionHandle, out x, out y);
-                GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
-                m_scene.SimulationService.UpdateAgent(destination, cAgentData);
+                m_scene.SimulationService.UpdateAgent(dest, cAgentData);
             }
             catch
             {
                 // Ignore; we did our best
             }
-
-            //if (regionAccepted)
-            //{
-            //    //m_log.Info("[INTERGRID]: Completed sending a neighbor an update about my agent");
-            //}
-            //else
-            //{
-            //    //m_log.Info("[INTERGRID]: Failed sending a neighbor an update about my agent");
-            //}
-                
         }
 
         private void SendChildAgentDataUpdateCompleted(IAsyncResult iar)
@@ -240,14 +227,28 @@ namespace OpenSim.Region.Framework.Scenes
             // This assumes that we know what our neighbors are.
             try
             {
+                uint x = 0, y = 0;
+                List<string> simulatorList = new List<string>();
                 foreach (ulong regionHandle in presence.KnownChildRegionHandles)
                 {
                     if (regionHandle != m_regionInfo.RegionHandle)
                     {
-                        SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
-                        d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, regionHandle,
-                                      SendChildAgentDataUpdateCompleted,
-                                      d);
+                        // we only want to send one update to each simulator; the simulator will
+                        // hand it off to the regions where a child agent exists, this does assume
+                        // 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))
+                        {
+                            // 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);
+                        }
                     }
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4fcd8f5..6a92378 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2055,8 +2055,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void GetProperties(IClientAPI client)
         {
+            //Viewer wants date in microseconds so multiply it by 1,000,000.
             client.SendObjectPropertiesReply(
-                m_fromUserInventoryItemID, (ulong)_creationDate, _creatorID, UUID.Zero, UUID.Zero,
+                m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero,
                 _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID,
                 ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description,
                 ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask,
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index b44a010..7c067ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -205,6 +205,14 @@ namespace OpenSim.Region.Framework.Scenes
             Reset();
         }
 
+        public int GetPendingObjectsCount()
+        {
+            if (m_pendingObjects != null)
+                return m_pendingObjects.Count;
+
+            return 0;
+        }
+
         public class ScenePartUpdate
         {
             public UUID FullID;