summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-05-24 10:44:27 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-05-24 10:44:27 -0700
commit1a5b3b0a9091a72fd5e5fb395f7f0c97b0fd502c (patch)
treef1025d69463201fdd23d46fb490fc93d29837803 /indra/llinventory/llparcel.cpp
parenteaf293f62f06e37f914efaf1cd33ab63648699d4 (diff)
ER-914: Disable Parcel Privacy UI in viewer if on older sim
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
-rw-r--r--indra/llinventory/llparcel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 7562bb8320..6236c0df6b 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -226,6 +226,9 @@ void LLParcel::init(const LLUUID &owner_id,
setPreviousOwnerID(LLUUID::null);
setPreviouslyGroupOwned(FALSE);
+
+ setPrivacy(false);
+ setHavePrivacyData(false);
}
void LLParcel::overrideOwner(const LLUUID& owner_id, BOOL is_group_owned)
@@ -728,6 +731,7 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_Privacy, private_parcel);
}
setPrivacy((bool) private_parcel);
+ setHavePrivacyData(have_privacy_data);
// non-optimized version
msg->getU8 ( "ParcelData", "MediaAutoScale", mMediaAutoScale );