* Added a way for the friends module to definitively know if an avatar's root agent is on the instance and if so, which region the avatar's root agent is in.

2 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 5389ec4..62011ea 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -133,6 +133,9 @@ namespace OpenSim.Region.Environment.Scenes
        
         public event ScriptChangedEvent OnScriptChangedEvent;
 
+        public event OnNewPresenceDelegate OnMakeChildAgent;
+
+
         public class MoneyTransferArgs : System.EventArgs 
         {
             public LLUUID sender;
@@ -185,6 +188,7 @@ namespace OpenSim.Region.Environment.Scenes
         private NewGridInstantMessage handler023 = null; //OnGridInstantMessageToIMModule;
         private NewGridInstantMessage handler024 = null; //OnGridInstantMessageToFriendsModule;
         private ClientClosed handler025 = null; //OnClientClosed;
+        private OnNewPresenceDelegate handler026 = null; //OnMakeChildAgent;
 
         public void TriggerOnScriptChangedEvent(uint localID, uint change)
         {
@@ -405,6 +409,16 @@ namespace OpenSim.Region.Environment.Scenes
                 handler025(ClientID);
             }
         }
+
+        public void TriggerOnMakeChildAgent(ScenePresence presence)
+        {
+            handler026 = OnMakeChildAgent;
+            if (handler026 != null)
+            {
+                handler026(presence);
+            }
+
+        }
         
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 9f3c924..ef23432 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -547,7 +547,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_isChildAgent = true;
             m_scene.SwapRootAgentCount(true);
             RemoveFromPhysicalScene();
-
+            m_scene.EventManager.TriggerOnMakeChildAgent(this);
             //this.Pos = new LLVector3(128, 128, 70);  
         }