aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
diff options
context:
space:
mode:
authorDiva Canto2012-10-04 15:33:17 -0700
committerDiva Canto2012-10-04 15:33:17 -0700
commit276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d (patch)
tree5ffb03205018d07a7d0590e8c1d0766b1cc2fbaf /OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
parentOne more abstraction for GridUser so that it can be overridden in a sub-class. (diff)
parentMake the asset retrieval concurrency a config switch. The current value (diff)
downloadopensim-SC-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.zip
opensim-SC-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.tar.gz
opensim-SC-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.tar.bz2
opensim-SC-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/EventManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index cee10df..9405075 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -96,9 +96,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
96 if (part == null) 96 if (part == null)
97 return; 97 return;
98 98
99 if ((part.ScriptEvents & scriptEvents.money) == 0)
100 part = part.ParentGroup.RootPart;
101
99 m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); 102 m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
100 103
101 part = part.ParentGroup.RootPart; 104// part = part.ParentGroup.RootPart;
102 money(part.LocalId, agentID, amount); 105 money(part.LocalId, agentID, amount);
103 } 106 }
104 107