diff options
author | Melanie | 2010-09-30 15:52:33 +0100 |
---|---|---|
committer | Melanie | 2010-09-30 15:52:33 +0100 |
commit | 90b51dc7d67507e27c4baa529e979de19dce8de1 (patch) | |
tree | f8f4f0003958acebd1db7764490c98746f0e18a9 /OpenSim/Region/CoreModules/World/Objects | |
parent | Fix an inventory fetch issue (diff) | |
download | opensim-SC_OLD-90b51dc7d67507e27c4baa529e979de19dce8de1.zip opensim-SC_OLD-90b51dc7d67507e27c4baa529e979de19dce8de1.tar.gz opensim-SC_OLD-90b51dc7d67507e27c4baa529e979de19dce8de1.tar.bz2 opensim-SC_OLD-90b51dc7d67507e27c4baa529e979de19dce8de1.tar.xz |
Forward-port 0.6 fix
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index c8fb9da..a674d60 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 | ||
@@ -114,6 +114,18 @@ 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 | |||
117 | SceneObjectGroup group = part.ParentGroup; | 129 | SceneObjectGroup group = part.ParentGroup; |
118 | 130 | ||
119 | switch (saleType) | 131 | switch (saleType) |