From 14b659e550b4e24ecffa87fc28ee0196c36c73e3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 2 Oct 2012 01:17:46 +0100
Subject: Send money() events to the clicked prim. Reverting a change I made
 over a year ago.

---
 OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/XEngine')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index cee10df..74baaf9 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
 
-            part = part.ParentGroup.RootPart;
+//            part = part.ParentGroup.RootPart;
             money(part.LocalId, agentID, amount);
         }
 
-- 
cgit v1.1


From 54ec8b197b9119d0443bed0797563a88bdf49f6f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 2 Oct 2012 01:25:55 +0100
Subject: Add money event routing to the script engine.

---
 OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/XEngine')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 74baaf9..9405075 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -96,6 +96,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (part == null)
                 return;
 
+            if ((part.ScriptEvents & scriptEvents.money) == 0)
+                part = part.ParentGroup.RootPart;
+
             m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
 
 //            part = part.ParentGroup.RootPart;
-- 
cgit v1.1