diff options
| author | simon@lindenlab.com <simon@lindenlab.com> | 2011-07-01 14:06:08 -0700 |
|---|---|---|
| committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-07-01 14:06:08 -0700 |
| commit | 918238dd18f74ee2783d55dfb961e8f44b2f4b1b (patch) | |
| tree | b3cf6772720d4509341f06135ee2241e579c9901 /indra/llinventory/llparcel.cpp | |
| parent | d40bd76ec76bf7d2fa59d15f5c71125c9813f31e (diff) | |
ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index e026ad32f9..c95f922301 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -227,7 +227,7 @@ void LLParcel::init(const LLUUID &owner_id, setPreviousOwnerID(LLUUID::null); setPreviouslyGroupOwned(FALSE); - setHiddenAVs(FALSE); + setSeeAVs(TRUE); setAllowGroupAVSounds(TRUE); setAllowAnyAVSounds(TRUE); setHaveNewParcelLimitData(FALSE); @@ -707,7 +707,7 @@ void LLParcel::packMessage(LLSD& msg) msg["user_location"] = ll_sd_from_vector3(mUserLocation); msg["user_look_at"] = ll_sd_from_vector3(mUserLookAt); msg["landing_type"] = (U8)mLandingType; - msg["hidden_avs"] = (LLSD::Boolean) getHiddenAVs(); + msg["see_avs"] = (LLSD::Boolean) getSeeAVs(); msg["group_av_sounds"] = (LLSD::Boolean) getAllowGroupAVSounds(); msg["any_av_sounds"] = (LLSD::Boolean) getAllowAnyAVSounds(); } @@ -728,19 +728,19 @@ void LLParcel::unpackMessage(LLMessageSystem* msg) msg->getStringFast( _PREHASH_ParcelData,_PREHASH_MediaURL, buffer ); setMediaURL(buffer); - BOOL hidden_avs = FALSE; + BOOL see_avs = TRUE; // All default to true for legacy server behavior BOOL any_av_sounds = TRUE; BOOL group_av_sounds = TRUE; - bool have_new_parcel_limit_data = (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_HiddenAVs) > 0); // New version of server should send all 3 of these values + bool have_new_parcel_limit_data = (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_SeeAVs) > 0); // New version of server should send all 3 of these values have_new_parcel_limit_data &= (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_AnyAVSounds) > 0); have_new_parcel_limit_data &= (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_GroupAVSounds) > 0); if (have_new_parcel_limit_data) { - msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_HiddenAVs, hidden_avs); + msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_SeeAVs, see_avs); msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_AnyAVSounds, any_av_sounds); msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_GroupAVSounds, group_av_sounds); } - setHiddenAVs((bool) hidden_avs); + setSeeAVs((bool) see_avs); setAllowAnyAVSounds((bool) any_av_sounds); setAllowGroupAVSounds((bool) group_av_sounds); |