6 files changed, 57 insertions, 73 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 35a3f43..b16ca53 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -306,13 +306,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             
             if (c.Scene != null)
             {
-                ((Scene)c.Scene).ForEachScenePresence
+                ((Scene)c.Scene).ForEachRootScenePresence
                 (
                     delegate(ScenePresence presence)
                     {
-                        // ignore chat from child agents
-                        if (presence.IsChildAgent) return;
-                        
                         IClientAPI client = presence.ControllingClient;
                         
                         // don't forward SayOwner chat from objects to
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 80957b4..00556c4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -98,10 +98,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         
         public void SendGeneralAlert(string message)
         {
-            m_scene.ForEachScenePresence(delegate(ScenePresence presence)
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
             {
-                if (!presence.IsChildAgent)
-                    presence.ControllingClient.SendAlertMessage(message);
+                presence.ControllingClient.SendAlertMessage(message);
             });
         }
 
@@ -163,10 +162,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         public void SendNotificationToUsersInRegion(
             UUID fromAvatarID, string fromAvatarName, string message)
         {
-            m_scene.ForEachScenePresence(delegate(ScenePresence presence)
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
             {
-                if (!presence.IsChildAgent)
-                    presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
+                presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
             });
         }
         
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index a83b3df..f73f9c1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                 }
                 else if (agentID == ALL_AGENTS)
                 {
-                    m_scene.ForEachScenePresence(
+                    m_scene.ForEachRootScenePresence(
                             delegate(ScenePresence p)
                             {
                                 if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 72b448b..321a705 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -143,24 +143,19 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             // Try root avatar only first
             foreach (Scene scene in m_Scenes)
             {
-                if (scene.Entities.ContainsKey(toAgentID) &&
-                        scene.Entities[toAgentID] is ScenePresence)
-                {
-//                    m_log.DebugFormat(
-//                        "[HG INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
-//                        toAgentID.ToString(), scene.RegionInfo.RegionName);
-                                        
-                    ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
-                    if (!user.IsChildAgent)
-                    {
-                        // Local message
-//                        m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
-                        user.ControllingClient.SendInstantMessage(im);
+//                m_log.DebugFormat(
+//                    "[HG INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
+//                    toAgentID.ToString(), scene.RegionInfo.RegionName);
+                ScenePresence sp = scene.GetScenePresence(toAgentID); 
+                if (sp != null && !sp.IsChildAgent)
+                {                                        
+                    // Local message
+//                  m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
+                    sp.ControllingClient.SendInstantMessage(im);
 
-                        // Message sent
-                        result(true);
-                        return;
-                    }
+                    // Message sent
+                    result(true);
+                    return;
                 }
             }
 
@@ -168,16 +163,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             foreach (Scene scene in m_Scenes)
             {
 //                m_log.DebugFormat(
-//                    "[HG INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
-
-                if (scene.Entities.ContainsKey(toAgentID) &&
-                        scene.Entities[toAgentID] is ScenePresence)
-                {
+//                    "[HG INSTANT MESSAGE]: Looking for child of {0} in {1}", 
+//                    toAgentID, scene.RegionInfo.RegionName);
+                ScenePresence sp = scene.GetScenePresence(toAgentID); 
+                if (sp != null)
+                {                   
                     // Local message
-                    ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
-
 //                    m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
-                    user.ControllingClient.SendInstantMessage(im);
+                    sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
                     result(true);
@@ -231,17 +224,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             bool successful = false;
             foreach (Scene scene in m_Scenes)
             {
-                if (scene.Entities.ContainsKey(toAgentID) &&
-                        scene.Entities[toAgentID] is ScenePresence)
+                ScenePresence sp = scene.GetScenePresence(toAgentID);
+                if(!sp.IsChildAgent)
                 {
-                    ScenePresence user =
-                            (ScenePresence)scene.Entities[toAgentID];
-
-                    if (!user.IsChildAgent)
-                    {
-                        scene.EventManager.TriggerIncomingInstantMessage(gim);
-                        successful = true;
-                    }
+                    scene.EventManager.TriggerIncomingInstantMessage(gim);
+                    successful = true;
                 }
             }
             if (!successful)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index ff74354..712632b 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -140,8 +140,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             // Try root avatar only first
             foreach (Scene scene in m_Scenes)
             {
-                if (scene.Entities.ContainsKey(toAgentID) &&
-                        scene.Entities[toAgentID] is ScenePresence)
+//                m_log.DebugFormat(
+//                    "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
+//                    toAgentID.ToString(), scene.RegionInfo.RegionName);
+                ScenePresence sp = scene.GetScenePresence(toAgentID);
+                if (sp != null && !sp.IsChildAgent)
                 {
 //                    m_log.DebugFormat(
 //                        "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
@@ -165,9 +168,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             {
 //                m_log.DebugFormat(
 //                    "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
-
-                if (scene.Entities.ContainsKey(toAgentID) &&
-                        scene.Entities[toAgentID] is ScenePresence)
+                ScenePresence sp = scene.GetScenePresence(toAgentID);
+                if (sp != null)
                 {
                     // Local message
                     ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
@@ -405,17 +407,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     // Trigger the Instant message in the scene.
                     foreach (Scene scene in m_Scenes)
                     {
-                        if (scene.Entities.ContainsKey(toAgentID) &&
-                                scene.Entities[toAgentID] is ScenePresence)
+                        ScenePresence sp = scene.GetScenePresence(toAgentID);
+                        if (sp != null && !sp.IsChildAgent)
                         {
-                            ScenePresence user =
-                                    (ScenePresence)scene.Entities[toAgentID];
-
-                            if (!user.IsChildAgent)
-                            {
-                                scene.EventManager.TriggerIncomingInstantMessage(gim);
-                                successful = true;
-                            }
+                            scene.EventManager.TriggerIncomingInstantMessage(gim);
+                            successful = true;
                         }
                     }
                     if (!successful)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 120fd43..b33342f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -277,19 +277,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     if (m_TransferModule != null)
                         m_TransferModule.SendInstantMessage(im, delegate(bool success) {
-                            // Send BulkUpdateInventory
-                            IInventoryService invService = scene.InventoryService;
-                            UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip
 
-                            InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId);
-                            folder = invService.GetFolder(folder);
-
-                            ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID));
-
-                            // If the user has left the scene by the time the message comes back then we can't send
-                            // them the update.
-                            if (fromUser != null)
-                                fromUser.ControllingClient.SendBulkUpdateInventory(folder);
+                            // justincc - FIXME: Comment out for now.  This code was added in commit db91044 Mon Aug 22 2011
+                            // and is apparently supposed to fix bulk inventory updates after accepting items.  But
+                            // instead it appears to cause two copies of an accepted folder for the receiving user in
+                            // at least some cases.  Folder/item update is already done when the offer is made (see code above)
+
+//                            // Send BulkUpdateInventory
+//                            IInventoryService invService = scene.InventoryService;
+//                            UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip
+//
+//                            InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId);
+//                            folder = invService.GetFolder(folder);
+//
+//                            ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID));
+//
+//                            // If the user has left the scene by the time the message comes back then we can't send
+//                            // them the update.
+//                            if (fromUser != null)
+//                                fromUser.ControllingClient.SendBulkUpdateInventory(folder);
                         });
                 }
             }