diff options
Diffstat (limited to 'linden/indra/llinventory')
-rw-r--r-- | linden/indra/llinventory/llparcel.h | 2 | ||||
-rw-r--r-- | linden/indra/llinventory/llparcelflags.h | 2 |
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: | |||
298 | const char* getMusicURL() const { return mMusicURL.c_str(); } | 298 | const char* getMusicURL() const { return mMusicURL.c_str(); } |
299 | const char* getMediaURL() const { return mMediaURL.c_str(); } | 299 | const char* getMediaURL() const { return mMediaURL.c_str(); } |
300 | const LLUUID& getMediaID() const { return mMediaID; } | 300 | const LLUUID& getMediaID() const { return mMediaID; } |
301 | const U8 getMediaAutoScale() const { return mMediaAutoScale; } | 301 | U8 getMediaAutoScale() const { return mMediaAutoScale; } |
302 | S32 getLocalID() const { return mLocalID; } | 302 | S32 getLocalID() const { return mLocalID; } |
303 | const LLUUID& getOwnerID() const { return mOwnerID; } | 303 | const LLUUID& getOwnerID() const { return mOwnerID; } |
304 | const LLUUID& getGroupID() const { return mGroupID; } | 304 | 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) | |||
64 | const U32 PF_ALLOW_VOICE_CHAT = 1 << 29; // Allow residents to use voice chat on this parcel | 64 | const U32 PF_ALLOW_VOICE_CHAT = 1 << 29; // Allow residents to use voice chat on this parcel |
65 | const U32 PF_USE_ESTATE_VOICE_CHAN = 1 << 30; | 65 | const U32 PF_USE_ESTATE_VOICE_CHAN = 1 << 30; |
66 | 66 | ||
67 | const U32 PF_RESERVED = 1 << 31; | 67 | const U32 PF_RESERVED = 1U << 31; |
68 | 68 | ||
69 | // If any of these are true the parcel is restricting access in some maner. | 69 | // If any of these are true the parcel is restricting access in some maner. |
70 | const U32 PF_USE_RESTRICTED_ACCESS = PF_USE_ACCESS_GROUP | 70 | const U32 PF_USE_RESTRICTED_ACCESS = PF_USE_ACCESS_GROUP |