aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2010-10-02 18:45:48 +0100
committerMelanie2010-10-02 18:45:48 +0100
commitb01020b84a1ec6aea29732fd2d930522d1348213 (patch)
tree501bf583bbd764039913b3138f6a609575bbbfbf /OpenSim/Region/CoreModules
parentReplace CalculateMass with a more accurate version, contributed by Ubit. (diff)
downloadopensim-SC-b01020b84a1ec6aea29732fd2d930522d1348213.zip
opensim-SC-b01020b84a1ec6aea29732fd2d930522d1348213.tar.gz
opensim-SC-b01020b84a1ec6aea29732fd2d930522d1348213.tar.bz2
opensim-SC-b01020b84a1ec6aea29732fd2d930522d1348213.tar.xz
Revert "Forward-port 0.6 fix"
This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs14
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index a674d60..c8fb9da 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, int salePrice) 107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType)
108 { 108 {
109 SceneObjectPart part = m_scene.GetSceneObjectPart(localID); 109 SceneObjectPart part = m_scene.GetSceneObjectPart(localID);
110 110
@@ -114,18 +114,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
114 if (part.ParentGroup == null) 114 if (part.ParentGroup == null)
115 return false; 115 return false;
116 116
117 if (part.ObjectSaleType != saleType)
118 {
119 m_dialogModule.SendAlertToUser(remoteClient, "This item is not available for the type of sale specified");
120 return false;
121 }
122
123 if (part.SalePrice != salePrice)
124 {
125 m_dialogModule.SendAlertToUser(remoteClient, "This item is not available for the price specified");
126 return false;
127 }
128
129 SceneObjectGroup group = part.ParentGroup; 117 SceneObjectGroup group = part.ParentGroup;
130 118
131 switch (saleType) 119 switch (saleType)