Merge branch 'master' into careminster-presence-refactor

11 files changed, 80 insertions, 87 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index f63089d..d3d6f25 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 // Save avatar attachment information
                 if (m_scene.AvatarFactory != null)
                 {
-                    m_log.Debug("[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", ItemID: " + itemID);
+                    m_log.Debug("[ATTACHMENTS MODULE]: Dettaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
                     m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 22c8937..7e5a8ec 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public void UpdateDatabase(UUID user, AvatarAppearance appearance)
         {
-            //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
+            m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
             AvatarData adata = new AvatarData(appearance);
             m_scene.AvatarService.SetAvatar(user, adata);
         }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3fcc0e8..927eeab 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -396,7 +396,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Position = position;
                 SetCallbackURL(agent, sp.Scene.RegionInfo);
 
-                UpdateAgent(reg, finalDestination, agent);
+                if (!UpdateAgent(reg, finalDestination, agent))
+                {
+                    // Region doesn't take it
+                    Fail(sp, finalDestination);
+                    return;
+                }
 
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
@@ -421,21 +426,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // that the client contacted the destination before we send the attachments and close things here.
                 if (!WaitForCallback(sp.UUID))
                 {
-                    // Client never contacted destination. Let's restore everything back
-                    sp.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
-
-                    // Fail. Reset it back
-                    sp.IsChildAgent = false;
-
-                    ResetFromTransit(sp.UUID);
-
-                    // Yikes! We should just have a ref to scene here.
-                    //sp.Scene.InformClientOfNeighbours(sp);
-                    EnableChildAgents(sp);
-
-                    // Finally, kill the agent we just created at the destination.
-                    m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID);
-
+                    Fail(sp, finalDestination);
                     return;
                 }
 
@@ -475,6 +466,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
 
+        private void Fail(ScenePresence sp, GridRegion finalDestination)
+        {
+            // Client never contacted destination. Let's restore everything back
+            sp.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
+
+            // Fail. Reset it back
+            sp.IsChildAgent = false;
+
+            ResetFromTransit(sp.UUID);
+
+            EnableChildAgents(sp);
+
+            // Finally, kill the agent we just created at the destination.
+            m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID);
+
+        }
 
         protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason)
         {
@@ -813,7 +820,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort +
                     "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
 
-                m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent);
+                if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
+                {
+                    // region doesn't take it
+                    ResetFromTransit(agent.UUID);
+                    return agent;
+                }
 
                 // Next, let's close the child agent connections that are too far away.
                 agent.CloseChildAgents(neighbourx, neighboury);
@@ -914,12 +926,40 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </summary>
         public void EnableChildAgent(ScenePresence sp, GridRegion region)
         {
+            m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName);
+
+            AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
             AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
             agent.BaseFolder = UUID.Zero;
             agent.InventoryFolder = UUID.Zero;
             agent.startpos = new Vector3(128, 128, 70);
             agent.child = true;
             agent.Appearance = sp.Appearance;
+            agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
+
+            agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
+            m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
+
+            if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
+                agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
+            m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
+
+            sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
+            foreach (ulong h in agent.ChildrenCapSeeds.Keys)
+                m_log.DebugFormat("[XXX] --> {0}", h);
+            m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
+            agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath);
+
+            if (sp.Scene.CapsModule != null)
+            {
+                sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, agent.ChildrenCapSeeds);
+            }
+
+            if (currentAgentCircuit != null)
+            {
+                agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                agent.Viewer = currentAgentCircuit.Viewer;
+            }
 
             IPEndPoint external = region.ExternalEndPoint;
             if (external != null)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index 8a90370..35518d5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -123,17 +123,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
 
         public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
-            m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
-                thisRegion.RegionName, regionHandle, m_Scenes.Count);
             foreach (Scene s in m_Scenes)
             {
                 if (s.RegionInfo.RegionHandle == regionHandle)
                 {
-                    m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour");
+                    //m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0} to {1}", thisRegion.RegionName, s.RegionInfo.RegionName);
                     return s.IncomingHelloNeighbour(thisRegion);
                 }
             }
-            m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle);
             return null;
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 1b00c8a..b2e3f4f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -181,22 +181,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            if (m_LocalCache.ContainsKey(regionID))
-            {
-                List<GridRegion> neighbours = m_LocalCache[regionID].GetNeighbours();
-                if (neighbours.Count == 0)
-                    // try the DB
-                    neighbours = m_GridService.GetNeighbours(scopeID, regionID);
-                return neighbours;
-            }
-            else
-            {
-                m_log.WarnFormat("[LOCAL GRID CONNECTOR]: GetNeighbours: Requested region {0} is not on this sim", regionID);
-                return new List<GridRegion>();
-            }
-
-            // Don't go to the DB
-            //return m_GridService.GetNeighbours(scopeID, regionID);
+            return m_GridService.GetNeighbours(scopeID, regionID); 
         }
 
         public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 46741a5..16e25e6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -153,12 +153,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return false;
         }
 
-        // Let's override GetNeighbours completely -- never go to the grid server
-        // Neighbours are/should be cached locally
-        // For retrieval from the DB, caller should call GetRegionByPosition
         public override List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            return m_LocalGridService.GetNeighbours(scopeID, regionID);
+            return base.GetNeighbours(scopeID, regionID);
         }
 
         public override GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index daba0b3..f71bf46 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -121,17 +121,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 
         public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
-            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
-                thisRegion.RegionName, regionHandle, m_Scenes.Count);
+            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}.",
+                thisRegion.RegionName, regionHandle);
             foreach (Scene s in m_Scenes)
             {
                 if (s.RegionInfo.RegionHandle == regionHandle)
                 {
-                    m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
+                    //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
                     return s.IncomingHelloNeighbour(thisRegion);
                 }
             }
-            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
+            //m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
             return null;
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 377c868..e16e273 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -181,7 +181,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
             {
-                //m_regionClient.SendUserInformation(regInfo, aCircuit);
                 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
             }
             return false;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b58bfb8..82d4759 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -964,12 +964,6 @@ namespace OpenSim.Region.Framework.Scenes
                     // Let the grid service module know, so this can be cached
                     m_eventManager.TriggerOnRegionUp(otherRegion);
 
-                    RegionInfo regInfo = new RegionInfo(xcell, ycell, otherRegion.InternalEndPoint, otherRegion.ExternalHostName);
-                    regInfo.RegionID = otherRegion.RegionID;
-                    regInfo.RegionName = otherRegion.RegionName;
-                    regInfo.ScopeID = otherRegion.ScopeID;
-                    regInfo.ExternalHostName = otherRegion.ExternalHostName;
-                    GridRegion r = new GridRegion(regInfo);
                     try
                     {
                         ForEachScenePresence(delegate(ScenePresence agent)
@@ -984,7 +978,7 @@ namespace OpenSim.Region.Framework.Scenes
                                                      old.Add(otherRegion.RegionHandle);
                                                      agent.DropOldNeighbours(old);
                                                      if (m_teleportModule != null)
-                                                         m_teleportModule.EnableChildAgent(agent, r);
+                                                         m_teleportModule.EnableChildAgent(agent, otherRegion);
                                                  }
                                              }
                             );
@@ -1546,6 +1540,7 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
                             LoginsDisabled = false;
+                            m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
                         }
                     }
                 }
@@ -1830,6 +1825,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             RegisterCommsEvents();
 
+            m_sceneGridService.SetScene(this);
+
             // These two 'commands' *must be* next to each other or sim rebooting fails.
             //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
 
@@ -1840,24 +1837,6 @@ namespace OpenSim.Region.Framework.Scenes
                 throw new Exception(error);
             }
 
-            m_sceneGridService.SetScene(this);
-            m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
-
-            //Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
-
-            //if (dGridSettings.ContainsKey("allow_forceful_banlines"))
-            //{
-            //    if (dGridSettings["allow_forceful_banlines"] != "TRUE")
-            //    {
-            //        m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
-            //        EventManager.TriggerSetAllowForcefulBan(false);
-            //    }
-            //    else
-            //    {
-            //        m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
-            //        EventManager.TriggerSetAllowForcefulBan(true);
-            //    }
-            //}
         }
 
         /// <summary>
@@ -3934,6 +3913,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat(
                 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
 
+            // XPTO: if this agent is not allowed here as root, always return false
+
             // We have to wait until the viewer contacts this region after receiving EAC.
             // That calls AddNewClient, which finally creates the ScenePresence
             ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 6309cd9..a9ecde8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -182,24 +182,17 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
 
-            for (int x = (int)region.RegionLocX - 1; x <= region.RegionLocX + 1; x++)
+            List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
+            m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
+            foreach (GridRegion n in neighbours)
             {
-                for (int y = (int)region.RegionLocY - 1; y <= region.RegionLocY + 1; y++)
-                {
-                    if (!((x == region.RegionLocX) && (y == region.RegionLocY))) // skip this region
-                    {
-                        ulong handle = Utils.UIntsToLong((uint)x * Constants.RegionSize, (uint)y * Constants.RegionSize);
-                        InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
-
-                        d.BeginInvoke(neighbourService, region, handle,
-                                      InformNeighborsThatRegionisUpCompleted,
-                                      d);
-                    }
-                }
+                InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
+                d.BeginInvoke(neighbourService, region, n.RegionHandle,
+                              InformNeighborsThatRegionisUpCompleted,
+                              d);
             }
         }
 
-
         public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle);
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6d2cd88..d4fc6cd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3390,6 +3390,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             {
                 if (cAgent.Attachments != null)
                 {
+                    m_appearance.ClearAttachments();
                     foreach (AttachmentData att in cAgent.Attachments)
                     {
                         m_appearance.SetAttachment(att.AttachPoint, att.ItemID, att.AssetID);