aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorubit2012-12-07 15:01:52 +0100
committerubit2012-12-07 15:01:52 +0100
commita4af71cbeab954595b775076bb006e8037ebb7d5 (patch)
tree65f61521c6db24f6db99764692e9948aba34f17a /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent fix regression (diff)
downloadopensim-SC-a4af71cbeab954595b775076bb006e8037ebb7d5.zip
opensim-SC-a4af71cbeab954595b775076bb006e8037ebb7d5.tar.gz
opensim-SC-a4af71cbeab954595b775076bb006e8037ebb7d5.tar.bz2
opensim-SC-a4af71cbeab954595b775076bb006e8037ebb7d5.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7593395..7ff30ca 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3013,7 +3013,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3013 } 3013 }
3014 3014
3015 bool result = money.ObjectGiveMoney( 3015 bool result = money.ObjectGiveMoney(
3016 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 3016 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero);
3017 3017
3018 if (result) 3018 if (result)
3019 return 1; 3019 return 1;
@@ -12547,7 +12547,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12547 } 12547 }
12548 12548
12549 bool result = money.ObjectGiveMoney( 12549 bool result = money.ObjectGiveMoney(
12550 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 12550 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero);
12551 12551
12552 if (result) 12552 if (result)
12553 { 12553 {