diff options
| author | Melanie | 2010-09-25 06:19:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-25 06:19:26 +0100 |
| commit | 4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd (patch) | |
| tree | 1e69a75f208cc7065bdd196bb99d13adfb5003b5 /OpenSim/Region/CoreModules | |
| parent | Experimental locking of taint processing (diff) | |
| parent | Fix a minor economy issue (diff) | |
| download | opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.zip opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.gz opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.bz2 opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index d91c36c..c8fb9da 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
| @@ -91,6 +91,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
| 91 | if (part.ParentGroup.IsDeleted) | 91 | if (part.ParentGroup.IsDeleted) |
| 92 | return; | 92 | return; |
| 93 | 93 | ||
| 94 | if (part.OwnerID != client.AgentId && (!m_scene.Permissions.IsGod(client.AgentId))) | ||
| 95 | return; | ||
| 96 | |||
| 94 | part = part.ParentGroup.RootPart; | 97 | part = part.ParentGroup.RootPart; |
| 95 | 98 | ||
| 96 | part.ObjectSaleType = saleType; | 99 | part.ObjectSaleType = saleType; |
| @@ -258,4 +261,4 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
| 258 | return true; | 261 | return true; |
| 259 | } | 262 | } |
| 260 | } | 263 | } |
| 261 | } \ No newline at end of file | 264 | } |