3 files changed, 20 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs
index f8eef82..6c714f8 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EventManager.cs
@@ -156,7 +156,11 @@ namespace OpenSim.Region.Environment.Scenes
 
         public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent;
 
-        public event OnNewPresenceDelegate OnMakeChildAgent;
+        public delegate void OnMakeChildAgentDelegate(ScenePresence presence);
+        public event OnMakeChildAgentDelegate OnMakeChildAgent;
+
+        public delegate void OnMakeRootAgentDelegate(ScenePresence presence);
+        public event OnMakeRootAgentDelegate OnMakeRootAgent;
 
         public delegate void NewInventoryItemUploadComplete(LLUUID avatarID, LLUUID assetID, string name, int userlevel);
 
@@ -307,7 +311,8 @@ namespace OpenSim.Region.Environment.Scenes
         private NewGridInstantMessage handlerGridInstantMessageToIM = null; //OnGridInstantMessageToIMModule;
         private NewGridInstantMessage handlerGridInstantMessageToFriends = null; //OnGridInstantMessageToFriendsModule;
         private ClientClosed handlerClientClosed = null; //OnClientClosed;
-        private OnNewPresenceDelegate handlerMakeChildAgent = null; //OnMakeChildAgent;
+        private OnMakeChildAgentDelegate handlerMakeChildAgent = null; //OnMakeChildAgent;
+        private OnMakeRootAgentDelegate handlerMakeRootAgent = null; //OnMakeRootAgent;
         private OnTerrainTickDelegate handlerTerrainTick = null; // OnTerainTick;
         private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps;
         private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps;
@@ -574,6 +579,15 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        public void TriggerOnMakeRootAgent(ScenePresence presence)
+        {
+            handlerMakeRootAgent = OnMakeRootAgent;
+            if (handlerMakeRootAgent != null)
+            {
+                handlerMakeRootAgent(presence);
+            }
+        }
+
         public void TriggerOnRegisterCaps(LLUUID agentID, Caps caps)
         {
             handlerRegisterCaps = OnRegisterCaps;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fe8cada..71c5b18 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1582,6 +1582,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
             }
+            EventManager.TriggerOnNewClient(client);
         }
 
         protected virtual void SubscribeToClientEvents(IClientAPI client)
@@ -1660,7 +1661,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnUndo += m_innerScene.HandleUndo;
             client.OnObjectGroupRequest += m_innerScene.HandleObjectGroupUpdate;
 
-            EventManager.TriggerOnNewClient(client);
+            // EventManager.TriggerOnNewClient(client);
         }
 
         public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 103068c..a692b33 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -590,6 +590,8 @@ namespace OpenSim.Region.Environment.Scenes
             //{
             m_scene.SendAllSceneObjectsToClient(this);
 
+            m_scene.EventManager.TriggerOnMakeRootAgent(this);
+
             //m_gotAllObjectsInScene = true;
             //}
         }