3 files changed, 66 insertions, 30 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 73c592d..faaf41c 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -40,23 +40,31 @@ namespace OpenSim.Region.CoreModules.World.Land
         //Land types set with flags in ParcelOverlay.
         //Only one of these can be used.
         public const float BAN_LINE_SAFETY_HIEGHT = 100;
-        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 128; //Equals 10000000
-        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 64; //Equals 01000000
 
         //RequestResults (I think these are right, they seem to work):
         public const int LAND_RESULT_MULTIPLE = 1; // The request they made contained more than a single peice of land
         public const int LAND_RESULT_SINGLE = 0; // The request they made contained only a single piece of land
 
         //ParcelSelectObjects
+        public const int LAND_SELECT_OBJECTS_OWNER = 2;
         public const int LAND_SELECT_OBJECTS_GROUP = 4;
         public const int LAND_SELECT_OBJECTS_OTHER = 8;
-        public const int LAND_SELECT_OBJECTS_OWNER = 2;
-        public const byte LAND_TYPE_IS_BEING_AUCTIONED = 5; //Equals 00000101
-        public const byte LAND_TYPE_IS_FOR_SALE = 4; //Equals 00000100
-        public const byte LAND_TYPE_OWNED_BY_GROUP = 2; //Equals 00000010
+
+
+        public const byte LAND_TYPE_PUBLIC = 0; //Equals 00000000
         public const byte LAND_TYPE_OWNED_BY_OTHER = 1; //Equals 00000001
+        public const byte LAND_TYPE_OWNED_BY_GROUP = 2; //Equals 00000010
         public const byte LAND_TYPE_OWNED_BY_REQUESTER = 3; //Equals 00000011
-        public const byte LAND_TYPE_PUBLIC = 0; //Equals 00000000
+        public const byte LAND_TYPE_IS_FOR_SALE = 4; //Equals 00000100
+        public const byte LAND_TYPE_IS_BEING_AUCTIONED = 5; //Equals 00000101
+        public const byte LAND_TYPE_unused6 = 6;
+        public const byte LAND_TYPE_unused7 = 7;
+        public const byte LAND_TYPE_unused8 = 8;
+        public const byte LAND_TYPE_HIDEAVATARS = 0x10;
+        public const byte LAND_TYPE_LOCALSOUND = 0x20;
+        public const byte LAND_TYPE_PROPERTY_BORDER_WEST = 0x40; //Equals 01000000
+        public const byte LAND_TYPE_PROPERTY_BORDER_SOUTH = 0x80; //Equals 10000000
+
 
         //These are other constants. Yay!
         public const int START_LAND_LOCAL_ID = 1;
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)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 74c2144..7321054 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -895,13 +895,31 @@ namespace OpenSim.Region.CoreModules.World.Land
         private byte[] ConvertLandBitmapToBytes()
         {
             byte[] tempConvertArr = new byte[512];
-            byte tempByte = 0;
+            int tempByte = 0;
             int x, y, i, byteNum = 0;
+            int mask = 1;
             i = 0;
             for (y = 0; y < 64; y++)
             {
                 for (x = 0; x < 64; x++)
                 {
+                    if (LandBitmap[x, y])
+                        tempByte |= mask;
+                    mask = mask << 1;
+                    if (mask == 0x100)
+                    {
+                        mask = 1;
+                        tempConvertArr[byteNum++] = (byte)tempByte;
+                        tempByte = 0;
+                    }
+                }
+            }
+
+            if(tempByte != 0 && byteNum < 512)
+                tempConvertArr[byteNum] = (byte)tempByte;
+
+
+/*
                     tempByte = Convert.ToByte(tempByte | Convert.ToByte(LandBitmap[x, y]) << (i++ % 8));
                     if (i % 8 == 0)
                     {
@@ -910,8 +928,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         i = 0;
                         byteNum++;
                     }
-                }
-            }
+ */
             return tempConvertArr;
         }