aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs14
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
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
133 133
134 public event ScriptChangedEvent OnScriptChangedEvent; 134 public event ScriptChangedEvent OnScriptChangedEvent;
135 135
136 public event OnNewPresenceDelegate OnMakeChildAgent;
137
138
136 public class MoneyTransferArgs : System.EventArgs 139 public class MoneyTransferArgs : System.EventArgs
137 { 140 {
138 public LLUUID sender; 141 public LLUUID sender;
@@ -185,6 +188,7 @@ namespace OpenSim.Region.Environment.Scenes
185 private NewGridInstantMessage handler023 = null; //OnGridInstantMessageToIMModule; 188 private NewGridInstantMessage handler023 = null; //OnGridInstantMessageToIMModule;
186 private NewGridInstantMessage handler024 = null; //OnGridInstantMessageToFriendsModule; 189 private NewGridInstantMessage handler024 = null; //OnGridInstantMessageToFriendsModule;
187 private ClientClosed handler025 = null; //OnClientClosed; 190 private ClientClosed handler025 = null; //OnClientClosed;
191 private OnNewPresenceDelegate handler026 = null; //OnMakeChildAgent;
188 192
189 public void TriggerOnScriptChangedEvent(uint localID, uint change) 193 public void TriggerOnScriptChangedEvent(uint localID, uint change)
190 { 194 {
@@ -405,6 +409,16 @@ namespace OpenSim.Region.Environment.Scenes
405 handler025(ClientID); 409 handler025(ClientID);
406 } 410 }
407 } 411 }
412
413 public void TriggerOnMakeChildAgent(ScenePresence presence)
414 {
415 handler026 = OnMakeChildAgent;
416 if (handler026 != null)
417 {
418 handler026(presence);
419 }
420
421 }
408 422
409 } 423 }
410} \ No newline at end of file 424} \ 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
547 m_isChildAgent = true; 547 m_isChildAgent = true;
548 m_scene.SwapRootAgentCount(true); 548 m_scene.SwapRootAgentCount(true);
549 RemoveFromPhysicalScene(); 549 RemoveFromPhysicalScene();
550 550 m_scene.EventManager.TriggerOnMakeChildAgent(this);
551 //this.Pos = new LLVector3(128, 128, 70); 551 //this.Pos = new LLVector3(128, 128, 70);
552 } 552 }
553 553