aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie Thielker2014-07-29 02:37:36 +0200
committerMelanie Thielker2014-07-29 02:37:36 +0200
commit181142c5ce533e8829094e7d8633084e2b49f2c7 (patch)
tree227f323f2052e2bcd1901c53a49a55fcd42e7910 /OpenSim/Region/CoreModules
parentfix the mess about exclusive fields and flags on land overlay (diff)
downloadopensim-SC-181142c5ce533e8829094e7d8633084e2b49f2c7.zip
opensim-SC-181142c5ce533e8829094e7d8633084e2b49f2c7.tar.gz
opensim-SC-181142c5ce533e8829094e7d8633084e2b49f2c7.tar.bz2
opensim-SC-181142c5ce533e8829094e7d8633084e2b49f2c7.tar.xz
Change some ORs to assignments as they should be
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 173dcd5..9058834 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1044,29 +1044,29 @@ namespace OpenSim.Region.CoreModules.World.Land
1044 if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId) 1044 if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
1045 { 1045 {
1046 //Owner Flag 1046 //Owner Flag
1047 tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER; 1047 tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER;
1048 } 1048 }
1049 else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID)) 1049 else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
1050 { 1050 {
1051 tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP; 1051 tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP;
1052 } 1052 }
1053 else if (currentParcelBlock.LandData.SalePrice > 0 && 1053 else if (currentParcelBlock.LandData.SalePrice > 0 &&
1054 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || 1054 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
1055 currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) 1055 currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
1056 { 1056 {
1057 //Sale type 1057 //Sale type
1058 tempByte |= (byte)LandChannel.LAND_TYPE_IS_FOR_SALE; 1058 tempByte = (byte)LandChannel.LAND_TYPE_IS_FOR_SALE;
1059 } 1059 }
1060 else if(currentParcelBlock.LandData.OwnerID == UUID.Zero) 1060 else if(currentParcelBlock.LandData.OwnerID == UUID.Zero)
1061 { 1061 {
1062 //Public type 1062 //Public type
1063 tempByte |= (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero 1063 tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
1064 } 1064 }
1065// LAND_TYPE_IS_BEING_AUCTIONED still unsuported 1065// LAND_TYPE_IS_BEING_AUCTIONED still unsuported
1066 else 1066 else
1067 { 1067 {
1068 //Other Flag 1068 //Other Flag
1069 tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER; 1069 tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER;
1070 } 1070 }
1071 1071
1072 // now flags 1072 // now flags