Second Life viewer sources 1.17.3.0

2 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index a33ffad..66af8ad 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -298,7 +298,7 @@ public:
         const char*             getMusicURL() const                     { return mMusicURL.c_str(); }
         const char*             getMediaURL() const                     { return mMediaURL.c_str(); }
         const LLUUID&   getMediaID() const                      { return mMediaID; }
-        const U8                getMediaAutoScale() const       { return mMediaAutoScale; }
+        U8                              getMediaAutoScale() const       { return mMediaAutoScale; }
         S32                             getLocalID() const                      { return mLocalID; }
         const LLUUID&   getOwnerID() const                      { return mOwnerID; }
         const LLUUID&   getGroupID() const                      { return mGroupID; }
diff --git a/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 38d49fe..0c07b29 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -64,7 +64,7 @@ const U32 PF_ALLOW_GROUP_OBJECT_ENTRY	= 1 << 28;	// Only allow group (and owner)
 const U32 PF_ALLOW_VOICE_CHAT                   = 1 << 29;      // Allow residents to use voice chat on this parcel
 const U32 PF_USE_ESTATE_VOICE_CHAN      = 1 << 30;
 
-const U32 PF_RESERVED                   = 1 << 31;
+const U32 PF_RESERVED                   = 1U << 31;
 
 // If any of these are true the parcel is restricting access in some maner.
 const U32 PF_USE_RESTRICTED_ACCESS = PF_USE_ACCESS_GROUP