aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/EventManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs12
1 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 09b79d0..5c4174e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -97,13 +97,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
97 return; 97 return;
98 98
99 m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); 99 m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
100 if (part.ParentGroup != null)
101 part = part.ParentGroup.RootPart;
102 100
103 if (part != null) 101 part = part.ParentGroup.RootPart;
104 { 102 money(part.LocalId, agentID, amount);
105 money(part.LocalId, agentID, amount);
106 }
107 } 103 }
108 104
109 /// <summary> 105 /// <summary>
@@ -356,9 +352,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
356 // timer: not handled here 352 // timer: not handled here
357 // listen: not handled here 353 // listen: not handled here
358 354
359 public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change) 355 public void control(UUID itemID, UUID agentID, uint held, uint change)
360 { 356 {
361 myScriptEngine.PostObjectEvent(localID, new EventParams( 357 myScriptEngine.PostScriptEvent(itemID, new EventParams(
362 "control",new object[] { 358 "control",new object[] {
363 new LSL_Types.LSLString(agentID.ToString()), 359 new LSL_Types.LSLString(agentID.ToString()),
364 new LSL_Types.LSLInteger(held), 360 new LSL_Types.LSLInteger(held),