diff options
author | UbitUmarov | 2014-07-29 00:39:08 +0100 |
---|---|---|
committer | UbitUmarov | 2014-07-29 00:39:08 +0100 |
commit | 3e1d2df261ba4f0b7dec9128adfe93ccccee01ae (patch) | |
tree | fe8fd43c64184f6d35b2f142a45975f1bca52d25 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |
parent | dont mess with sound gain on stop (diff) | |
download | opensim-SC_OLD-3e1d2df261ba4f0b7dec9128adfe93ccccee01ae.zip opensim-SC_OLD-3e1d2df261ba4f0b7dec9128adfe93ccccee01ae.tar.gz opensim-SC_OLD-3e1d2df261ba4f0b7dec9128adfe93ccccee01ae.tar.bz2 opensim-SC_OLD-3e1d2df261ba4f0b7dec9128adfe93ccccee01ae.tar.xz |
change parcel overlay bytes adding LocalSound.. changed others also NEEDS
checking
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 0e2aba9..834448c 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1040,33 +1040,37 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1040 | 1040 | ||
1041 | if (currentParcelBlock != null) | 1041 | if (currentParcelBlock != null) |
1042 | { | 1042 | { |
1043 | if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId) | 1043 | if (currentParcelBlock.LandData.OwnerID == UUID.Zero) |
1044 | { | 1044 | { |
1045 | //Owner Flag | 1045 | //Public Flag |
1046 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); | 1046 | tempByte |= (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing |
1047 | } | 1047 | } |
1048 | else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID)) | 1048 | else if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId) |
1049 | { | 1049 | { |
1050 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP); | 1050 | //Owner Flag |
1051 | tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER; | ||
1051 | } | 1052 | } |
1052 | else if (currentParcelBlock.LandData.SalePrice > 0 && | 1053 | else |
1053 | (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || | ||
1054 | currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) | ||
1055 | { | 1054 | { |
1056 | //Sale Flag | 1055 | //Other Flag |
1057 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE); | 1056 | tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER; |
1058 | } | 1057 | } |
1059 | else if (currentParcelBlock.LandData.OwnerID == UUID.Zero) | 1058 | |
1059 | if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID)) | ||
1060 | { | 1060 | { |
1061 | //Public Flag | 1061 | tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP; |
1062 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC); | ||
1063 | } | 1062 | } |
1064 | else | 1063 | |
1064 | if (currentParcelBlock.LandData.SalePrice > 0 && | ||
1065 | (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || | ||
1066 | currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) | ||
1065 | { | 1067 | { |
1066 | //Other Flag | 1068 | //Sale Flag |
1067 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_OTHER); | 1069 | tempByte |= (byte)LandChannel.LAND_TYPE_IS_FOR_SALE; |
1068 | } | 1070 | } |
1069 | 1071 | ||
1072 | // LAND_TYPE_IS_BEING_AUCTIONED not suported? | ||
1073 | |||
1070 | //Now for border control | 1074 | //Now for border control |
1071 | 1075 | ||
1072 | ILandObject westParcel = null; | 1076 | ILandObject westParcel = null; |
@@ -1082,22 +1086,29 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1082 | 1086 | ||
1083 | if (x == 0) | 1087 | if (x == 0) |
1084 | { | 1088 | { |
1085 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST); | 1089 | tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_WEST; |
1086 | } | 1090 | } |
1087 | else if (westParcel != null && westParcel != currentParcelBlock) | 1091 | else if (westParcel != null && westParcel != currentParcelBlock) |
1088 | { | 1092 | { |
1089 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST); | 1093 | tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_WEST; |
1090 | } | 1094 | } |
1091 | 1095 | ||
1092 | if (y == 0) | 1096 | if (y == 0) |
1093 | { | 1097 | { |
1094 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH); | 1098 | tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_SOUTH; |
1095 | } | 1099 | } |
1096 | else if (southParcel != null && southParcel != currentParcelBlock) | 1100 | else if (southParcel != null && southParcel != currentParcelBlock) |
1097 | { | 1101 | { |
1098 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH); | 1102 | tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_SOUTH; |
1099 | } | 1103 | } |
1100 | 1104 | ||
1105 | if ((currentParcelBlock.LandData.Flags & (uint)ParcelFlags.SoundLocal) != 0) | ||
1106 | tempByte |= (byte)LandChannel.LAND_TYPE_LOCALSOUND; | ||
1107 | |||
1108 | // if ((currentParcelBlock.LandData.Flags & (uint)ParcelFlags.???hideavatar) != 0) | ||
1109 | // tempByte |= (byte)LandChannel.LAND_TYPE_HIDEAVATARS; | ||
1110 | |||
1111 | |||
1101 | byteArray[byteArrayCount] = tempByte; | 1112 | byteArray[byteArrayCount] = tempByte; |
1102 | byteArrayCount++; | 1113 | byteArrayCount++; |
1103 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) | 1114 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) |