1 files changed, 20 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
index 6f7235e..6e13b73 100644
--- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -82,6 +82,7 @@ namespace OpenSim.Region.Environment.Modules
             // Don't send a Friend Dialog IM with a LLUUID.Zero session.
             if (!(dialogHandledElsewhere && imSessionID == LLUUID.Zero))
             {
+                // Try root avatar only first
                 foreach (Scene scene in m_scenes)
                 {
                     if (scene.Entities.ContainsKey(toAgentID) && scene.Entities[toAgentID] is ScenePresence)
@@ -98,8 +99,27 @@ namespace OpenSim.Region.Environment.Modules
                         }
                     }
                 }
+
+                // try child avatar second
+                foreach (Scene scene in m_scenes)
+                {
+                    if (scene.Entities.ContainsKey(toAgentID) && scene.Entities[toAgentID] is ScenePresence)
+                    {
+                        // Local message
+                        ScenePresence user = (ScenePresence)scene.Entities[toAgentID];
+                        
+                        user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
+                                                                  toAgentID, imSessionID, fromAgentName, dialog,
+                                                                  timestamp);
+                        // Message sent
+                        return;
+                        
+                    }
+                }
+
             }
 
+
             // Still here, try send via Grid
             // TODO
         }