OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change some ORs to assignments as they should be

avinationmerge
Melanie Thielker 2014-07-29 02:37:36 +02:00
parent 6b0521d3c9
commit 181142c5ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -1044,29 +1044,29 @@ namespace OpenSim.Region.CoreModules.World.Land
if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId) if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
{ {
//Owner Flag //Owner Flag
tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER; tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER;
} }
else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID)) else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
{ {
tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP; tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP;
} }
else if (currentParcelBlock.LandData.SalePrice > 0 && else if (currentParcelBlock.LandData.SalePrice > 0 &&
(currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
{ {
//Sale type //Sale type
tempByte |= (byte)LandChannel.LAND_TYPE_IS_FOR_SALE; tempByte = (byte)LandChannel.LAND_TYPE_IS_FOR_SALE;
} }
else if(currentParcelBlock.LandData.OwnerID == UUID.Zero) else if(currentParcelBlock.LandData.OwnerID == UUID.Zero)
{ {
//Public type //Public type
tempByte |= (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
} }
// LAND_TYPE_IS_BEING_AUCTIONED still unsuported // LAND_TYPE_IS_BEING_AUCTIONED still unsuported
else else
{ {
//Other Flag //Other Flag
tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER; tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER;
} }
// now flags // now flags