From 789e9901ddadf8c10a6296225a3fa50197ea43f0 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 24 Jan 2013 21:32:25 +0100
Subject: Make llGiveMoney async again. The return value is now the constant 1
 to make scripts work properly. Scripts will no longer receive a failure
 indication through this return value;

---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4709c0b..53c6e5c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3019,17 +3019,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Integer llGiveMoney(string destination, int amount)
         {
-//            Util.FireAndForget(x =>
-//            {
+            Util.FireAndForget(x =>
+            {
                 m_host.AddScriptLPS(1);
 
                 if (m_item.PermsGranter == UUID.Zero)
-                    return 0;
+                    return;
 
                 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
                 {
                     LSLError("No permissions to give money");
-                    return 0;
+                    return;
                 }
 
                 UUID toID = new UUID();
@@ -3037,7 +3037,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (!UUID.TryParse(destination, out toID))
                 {
                     LSLError("Bad key in llGiveMoney");
-                    return 0;
+                    return;
                 }
 
                 IMoneyModule money = World.RequestModuleInterface<IMoneyModule>();
@@ -3045,12 +3045,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (money == null)
                 {
                     NotImplemented("llGiveMoney");
-                    return 0;
+                    return;
                 }
 
-                return money.ObjectGiveMoney(
+                money.ObjectGiveMoney(
                     m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero);
-//            });
+            });
+
+            return 0;
         }
 
         public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
-- 
cgit v1.1