aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-10-02 18:47:26 +0100
committerMelanie2010-10-02 18:47:26 +0100
commit87c63868840705e479c9c11123e27ce191c38619 (patch)
tree18a11f6f526ed31de0d317581fe9178f12ea0cbc
parentRevert "Forward-port 0.6 fix" (diff)
downloadopensim-SC_OLD-87c63868840705e479c9c11123e27ce191c38619.zip
opensim-SC_OLD-87c63868840705e479c9c11123e27ce191c38619.tar.gz
opensim-SC_OLD-87c63868840705e479c9c11123e27ce191c38619.tar.bz2
opensim-SC_OLD-87c63868840705e479c9c11123e27ce191c38619.tar.xz
Reapplying the parts of the prior revert that were not derived from the
original patch
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IBuySellModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs4
3 files changed, 5 insertions, 5 deletions
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
104 part.GetProperties(client); 104 part.GetProperties(client);
105 } 105 }
106 106
107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType) 107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice)
108 { 108 {
109 SceneObjectPart part = m_scene.GetSceneObjectPart(localID); 109 SceneObjectPart part = m_scene.GetSceneObjectPart(localID);
110 110
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
42 /// <returns> 42 /// <returns>
43 /// True on a successful purchase, false on failure 43 /// True on a successful purchase, false on failure
44 /// </returns> 44 /// </returns>
45 bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType); 45 bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice);
46 } 46 }
47} \ No newline at end of file 47}
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
814 814
815 IBuySellModule module = s.RequestModuleInterface<IBuySellModule>(); 815 IBuySellModule module = s.RequestModuleInterface<IBuySellModule>();
816 if (module != null) 816 if (module != null)
817 module.BuyObject(remoteClient, categoryID, localID, saleType); 817 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
818 } 818 }
819 } 819 }
820 820
@@ -825,4 +825,4 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
825 Gift = 2, 825 Gift = 2,
826 Purchase = 3 826 Purchase = 3
827 } 827 }
828} \ No newline at end of file 828}