ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 14:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination-current' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
This commit is contained in:
Melanie
2013-06-23 01:48:57 +01:00
parent 25ed1658ca 8e9d6c6c56
commit 24a4367fc2
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -3180,8 +3180,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
string reason;
money.ObjectGiveMoney(
m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero);
m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero, out reason);
});
return 0;
@@ -12841,8 +12842,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
string reason;
bool result = money.ObjectGiveMoney(
m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn);
m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn, out reason);
if (result)
{
@@ -12850,7 +12852,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS";
replydata = reason;
}
finally
{