ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
This commit is contained in:
Melanie
2012-10-03 00:24:33 +01:00
parent e40cc46712 ca5c0814f4
commit 23d5bafa7f
19 changed files with 648 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
View File

@@ -96,9 +96,12 @@ 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;
// part = part.ParentGroup.RootPart;
money(part.LocalId, agentID, amount);
}