diff options
author | Kitto Flora | 2010-04-05 14:08:57 -0400 |
---|---|---|
committer | Kitto Flora | 2010-04-05 14:08:57 -0400 |
commit | 35bf75a77a0ec3392b05aad90b80e47e3aa175e8 (patch) | |
tree | 3f6eeba7b0b7b51ea6b11e4183e68f2468a10f58 /OpenSim | |
parent | ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added 'fence... (diff) | |
parent | Change land overlay to send group owned status properly (diff) | |
download | opensim-SC-35bf75a77a0ec3392b05aad90b80e47e3aa175e8.zip opensim-SC-35bf75a77a0ec3392b05aad90b80e47e3aa175e8.tar.gz opensim-SC-35bf75a77a0ec3392b05aad90b80e47e3aa175e8.tar.bz2 opensim-SC-35bf75a77a0ec3392b05aad90b80e47e3aa175e8.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9be94ce..6c9830c 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1014,6 +1014,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1014 | //Owner Flag | 1014 | //Owner Flag |
1015 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); | 1015 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); |
1016 | } | 1016 | } |
1017 | else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID)) | ||
1018 | { | ||
1019 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP); | ||
1020 | } | ||
1017 | else if (currentParcelBlock.LandData.SalePrice > 0 && | 1021 | else if (currentParcelBlock.LandData.SalePrice > 0 && |
1018 | (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || | 1022 | (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || |
1019 | currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) | 1023 | currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) |