change parcel overlay bytes adding LocalSound.. changed others also NEEDS

checking

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
 
                     if (currentParcelBlock != null)
                     {
-                        if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
+                        if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
                         {
-                            //Owner Flag
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
+                            //Public Flag
+                            tempByte |= (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing
                         }
-                        else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
+                        else if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
                         {
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP);
+                            //Owner Flag
+                            tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER;
                         }
-                        else if (currentParcelBlock.LandData.SalePrice > 0 &&
-                                 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
-                                  currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
+                        else
                         {
-                            //Sale Flag
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE);
+                            //Other Flag
+                            tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER;
                         }
-                        else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
+
+                        if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
                         {
-                            //Public Flag
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC);
+                            tempByte |= (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP;
                         }
-                        else
+
+                        if (currentParcelBlock.LandData.SalePrice > 0 &&
+                                 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
+                                  currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
                         {
-                            //Other Flag
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_OTHER);
+                            //Sale Flag
+                            tempByte |= (byte)LandChannel.LAND_TYPE_IS_FOR_SALE;
                         }
 
+                        // LAND_TYPE_IS_BEING_AUCTIONED not suported?
+
                         //Now for border control
 
                         ILandObject westParcel = null;
@@ -1082,22 +1086,29 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                         if (x == 0)
                         {
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
+                            tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_WEST;
                         }
                         else if (westParcel != null && westParcel != currentParcelBlock)
                         {
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
+                            tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_WEST;
                         }
 
                         if (y == 0)
                         {
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                            tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_SOUTH;
                         }
                         else if (southParcel != null && southParcel != currentParcelBlock)
                         {
-                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                            tempByte |= (byte)LandChannel.LAND_TYPE_PROPERTY_BORDER_SOUTH;
                         }
 
+                        if ((currentParcelBlock.LandData.Flags & (uint)ParcelFlags.SoundLocal) != 0)
+                            tempByte |= (byte)LandChannel.LAND_TYPE_LOCALSOUND;
+
+//                        if ((currentParcelBlock.LandData.Flags & (uint)ParcelFlags.???hideavatar) != 0)
+//                            tempByte |= (byte)LandChannel.LAND_TYPE_HIDEAVATARS;
+
+
                         byteArray[byteArrayCount] = tempByte;
                         byteArrayCount++;
                         if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)