From ad264a6b6dbb92a48bb744936a2f3967fb637730 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 13 Jul 2007 20:01:16 +0000
Subject: * Fixing issue with ParcelFlags. ParcelFlags is now a uint rather
 than an enum.

---
 OpenSim/Region/Environment/ParcelManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 5e7ee18..1e55633 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment
 
             fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
             fullSimParcel.parcelData.salePrice = 1;
-            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
+            fullSimParcel.parcelData.parcelFlags |= (uint)libsecondlife.Parcel.ParcelFlags.ForSale;
             fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
 
             addParcel(fullSimParcel);
@@ -603,7 +603,7 @@ namespace OpenSim.Region.Environment
             updatePacket.ParcelData.OtherPrims = 0; //unemplented
             updatePacket.ParcelData.OwnerID = parcelData.ownerID;
             updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
-            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
+            updatePacket.ParcelData.ParcelFlags = parcelData.parcelFlags; //unemplemented
             updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
             updatePacket.ParcelData.PassHours = parcelData.passHours;
             updatePacket.ParcelData.PassPrice = parcelData.passPrice;
@@ -644,7 +644,7 @@ namespace OpenSim.Region.Environment
                 parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
                 parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
                 parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
-                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
+                parcelData.parcelFlags = packet.ParcelData.ParcelFlags;
                 parcelData.passHours = packet.ParcelData.PassHours;
                 parcelData.passPrice = packet.ParcelData.PassPrice;
                 parcelData.salePrice = packet.ParcelData.SalePrice;
-- 
cgit v1.1