6 files changed, 124 insertions, 40 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index c88142a..aaa331b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnClientClosed += OnClientClosed;
-//            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
+            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
             scene.EventManager.OnClientLogin += OnClientLogin;
         }
 
@@ -362,18 +362,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 m_NeedsListOfOnlineFriends.Add(agentID);
         }
 
-        public void IsNpwRoot(ScenePresence sp)
+        public void IsNowRoot(ScenePresence sp)
         {
-            RecacheFriends(sp.ControllingClient);
-
-            lock (m_NeedsToNotifyStatus)
-            {
-                if (m_NeedsToNotifyStatus.Remove(sp.UUID))
-                {
-                    // Inform the friends that this user is online. This can only be done once the client is a Root Agent.
-                    StatusChange(sp.UUID, true);
-                }
-            }
+            OnMakeRootAgent(sp);
         }
 
         public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client)
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index b735c61..543410e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -182,11 +182,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
                     m_ClientMap.Add(client.AgentId, client);
                 }
             }
-
-            GroupMembershipData[] updateGroups = new GroupMembershipData[1];
-            updateGroups[0] = osGroup;
-
-            client.SendGroupMembership(updateGroups);
         }
 
         private void OnAgentDataUpdateRequest(IClientAPI remoteClient,
@@ -237,6 +232,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
             remote_client.SendGroupNameReply(groupUUID, groupnamereply);
         }
 
+        public GroupMembershipData[] GetMembershipData(UUID agentID)
+        {
+            GroupMembershipData[] updateGroups = new GroupMembershipData[1];
+            updateGroups[0] = osGroup;
+            return updateGroups;
+        }
+
+        public GroupMembershipData GetActiveMembershipData(UUID agentID)
+        {
+            return osGroup;
+        }
+
         private void OnClientClosed(UUID agentID, Scene scene)
         {
             lock (m_ClientMap)
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 4119f90..4d7c25b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -306,9 +306,21 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         ///
         /// RezObject
         ///
-        public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
-                                                   UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
-                                                   bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
+        // compatibility do not use
+        public override SceneObjectGroup RezObject(
+            IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
+            UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
+            bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
+        {
+            return RezObject(remoteClient, itemID, UUID.Zero, RayEnd, RayStart,
+                    RayTargetID, BypassRayCast, RayEndIsIntersection,
+                    RezSelected, RemoveItem, fromTaskID, attachment);
+        }
+
+        public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, 
+                            UUID groupID, Vector3 RayEnd, Vector3 RayStart,
+                            UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
+                            bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
             m_log.DebugFormat("[HGScene]: RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID);
 
@@ -331,7 +343,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             //}
 
             // OK, we're done fetching. Pass it up to the default RezObject
-            SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
+            SceneObjectGroup sog = base.RezObject(remoteClient, itemID, groupID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
                                    RezSelected, RemoveItem, fromTaskID, attachment);
 
             return sog;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 8c560e5..00e2670 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -818,12 +818,22 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             
             return item;
         }
-
+        // compatibility do not use
         public virtual SceneObjectGroup RezObject(
             IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
             UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
+            return RezObject(remoteClient, itemID, UUID.Zero, RayEnd, RayStart,
+                    RayTargetID, BypassRayCast, RayEndIsIntersection,
+                    RezSelected, RemoveItem, fromTaskID, attachment);
+        }
+
+        public virtual SceneObjectGroup RezObject(
+            IClientAPI remoteClient, UUID itemID, UUID rezGroupID, Vector3 RayEnd, Vector3 RayStart,
+            UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
+            bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
+        {
 //            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
             InventoryItemBase item = m_Scene.InventoryService.GetItem(remoteClient.AgentId, itemID);
 
@@ -835,16 +845,28 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             item.Owner = remoteClient.AgentId;
 
             return RezObject(
-                remoteClient, item, item.AssetID,
+                remoteClient, item, rezGroupID, item.AssetID,
                 RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
                 RezSelected, RemoveItem, fromTaskID, attachment);
         }
-
+        // compatility
         public virtual SceneObjectGroup RezObject(
             IClientAPI remoteClient, InventoryItemBase item, UUID assetID, Vector3 RayEnd, Vector3 RayStart,
             UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
+            return RezObject(remoteClient, item, UUID.Zero, assetID,
+                    RayEnd, RayStart, RayTargetID,
+                    BypassRayCast, RayEndIsIntersection,
+                    RezSelected, RemoveItem, fromTaskID, attachment);
+        }
+
+        public virtual SceneObjectGroup RezObject(
+            IClientAPI remoteClient, InventoryItemBase item, UUID groupID, UUID assetID,
+                Vector3 RayEnd, Vector3 RayStart, UUID RayTargetID,
+                byte BypassRayCast, bool RayEndIsIntersection,
+                bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
+        {
             AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());           
 
             if (rezAsset == null)
@@ -986,6 +1008,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     group.IsAttachment = true;
                 }
 
+                group.SetGroup(groupID, remoteClient);
+
                 // If we're rezzing an attachment then don't ask
                 // AddNewSceneObject() to update the client since
                 // we'll be doing that later on.  Scheduling more than
@@ -995,12 +1019,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 m_Scene.AddNewSceneObject(group, true, false);
 
                 if (!attachment)
+                {
                     group.AbsolutePosition = pos + veclist[i];
 
-                group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
-
-                if (!attachment)
-                {
                     // Fire on_rez
                     group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
                     rootPart.ParentGroup.ResumeScripts();
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index 172b864..b31d4df 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             
             SceneObjectGroup so 
                 = m_iam.RezObject(
-                    m_tc, item1Id, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
+                    m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
             
             Assert.That(so, Is.Not.Null);
             
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 6f10f51..959829c 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1060,27 +1060,80 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="maxY"></param>
         public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
+//            m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
 
             GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
         }
 
+        private const double SPAMBLOCKTIMEms = 300000; // 5 minutes
+        private Dictionary<UUID,double> spamBlocked = new Dictionary<UUID,double>();
+
         protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            MapBlockRequestData req = new MapBlockRequestData();
+            // anti spam because of FireStorm 4.7.7 absurd request repeat rates
+            // possible others
 
-            req.client = remoteClient;
-            req.minX = minX;
-            req.maxX = maxX;
-            req.minY = minY;
-            req.maxY = maxY;
-            req.flags = flag;
+            double now = Util.GetTimeStampMS();
+            UUID agentID = remoteClient.AgentId;
 
             lock (m_mapBlockRequestEvent)
             {
-                if (!m_mapBlockRequests.ContainsKey(remoteClient.AgentId))
-                    m_mapBlockRequests[remoteClient.AgentId] = new Queue<MapBlockRequestData>();
-                m_mapBlockRequests[remoteClient.AgentId].Enqueue(req);
+                if(spamBlocked.ContainsKey(agentID))
+                {
+                    if(spamBlocked[agentID] < now &&
+                            (!m_mapBlockRequests.ContainsKey(agentID) ||
+                            m_mapBlockRequests[agentID].Count == 0 ))
+                    {
+                        spamBlocked.Remove(agentID);
+                        m_log.DebugFormat("[WoldMapModule] RequestMapBlocks release spammer {0}", agentID);
+                    }
+                    else
+                        return new List<MapBlockData>();
+                }
+                else
+                {
+                // ugly slow expire spammers
+                    if(spamBlocked.Count > 0)
+                    {
+                        UUID k = UUID.Zero;
+                        bool expireone = false;
+                        foreach(UUID k2 in spamBlocked.Keys)
+                        {
+                            if(spamBlocked[k2] < now &&
+                                (!m_mapBlockRequests.ContainsKey(k2) ||
+                                m_mapBlockRequests[k2].Count == 0 ))
+                            {
+                                m_log.DebugFormat("[WoldMapModule] RequestMapBlocks release spammer {0}", k2);
+                                k = k2;
+                                expireone = true;
+                            }
+                        break; // doing one at a time
+                        }
+                    if(expireone)
+                        spamBlocked.Remove(k);
+                    }
+                }
+
+//                m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
+
+                MapBlockRequestData req = new MapBlockRequestData();
+
+                req.client = remoteClient;
+                req.minX = minX;
+                req.maxX = maxX;
+                req.minY = minY;
+                req.maxY = maxY;
+                req.flags = flag;
+
+                if (!m_mapBlockRequests.ContainsKey(agentID))
+                    m_mapBlockRequests[agentID] = new Queue<MapBlockRequestData>();
+                if(m_mapBlockRequests[agentID].Count < 150 )
+                    m_mapBlockRequests[agentID].Enqueue(req);
+                else
+                { 
+                    spamBlocked[agentID] = now + SPAMBLOCKTIMEms;
+                    m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0);
+                }
                 m_mapBlockRequestEvent.Set();
             }