diff options
| author | Melanie | 2010-10-02 19:51:43 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-02 19:51:43 +0100 |
| commit | fd56fd2ce8884047885724a2f89df47398136db0 (patch) | |
| tree | e0b6efa594c4d30315e8afa0b1a41e84975f16ad /OpenSim/Region/CoreModules | |
| parent | Replace CalculateMass with a more accurate version, contributed by Ubit. (diff) | |
| parent | Reapplying the parts of the prior revert that were not derived from the (diff) | |
| download | opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.zip opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.tar.gz opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.tar.bz2 opensim-SC-fd56fd2ce8884047885724a2f89df47398136db0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index a674d60..c06ccb2 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
| @@ -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) |