From 87c63868840705e479c9c11123e27ce191c38619 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 2 Oct 2010 18:47:26 +0100
Subject: Reapplying the parts of the prior revert that were not derived from
 the original patch

---
 OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs     | 2 +-
 OpenSim/Region/Framework/Interfaces/IBuySellModule.cs                 | 4 ++--
 OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index c8fb9da..c06ccb2 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
             part.GetProperties(client);
         }
 
-        public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType)
+        public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice)
         {
             SceneObjectPart part = m_scene.GetSceneObjectPart(localID);
 
diff --git a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
index 0132bae..d1ce4c0 100644
--- a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
@@ -42,6 +42,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns>
         /// True on a successful purchase, false on failure
         /// </returns>
-        bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType);
+        bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice);
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index cc51c3b..d364df6 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -814,7 +814,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             
             IBuySellModule module = s.RequestModuleInterface<IBuySellModule>();
             if (module != null)
-                module.BuyObject(remoteClient, categoryID, localID, saleType);
+                module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
         }
     }
 
@@ -825,4 +825,4 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         Gift = 2,
         Purchase = 3
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1