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.

3 files changed, 11 insertions, 11 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);
 
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index c27e5a5091..ff35caab4c 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -75,7 +75,7 @@ const U8 PARCEL_AUCTION		= 0x05;
 // unused 0x06
 // unused 0x07
 // flag, unused 0x08
-const U8 PARCEL_HIDDENAVS   = 0x10;	// avatars not visible outside of parcel
+const U8 PARCEL_HIDDENAVS   = 0x10;	// avatars not visible outside of parcel.  Used for 'see avs' feature, but must be off for compatibility
 const U8 PARCEL_SOUND_LOCAL = 0x20;
 const U8 PARCEL_WEST_LINE	= 0x40;	// flag, property line on west edge
 const U8 PARCEL_SOUTH_LINE	= 0x80;	// flag, property line on south edge
@@ -271,7 +271,7 @@ public:
 	void setUserLocation(const LLVector3& pos)	{ mUserLocation = pos; }
 	void setUserLookAt(const LLVector3& rot)	{ mUserLookAt = rot; }
 	void setLandingType(const ELandingType type) { mLandingType = type; }
-	void setHiddenAVs(BOOL hidden_avs)	{ mHiddenAVs = hidden_avs;	}
+	void setSeeAVs(BOOL see_avs)	{ mSeeAVs = see_avs;	}
 	void setHaveNewParcelLimitData(bool have_new_parcel_data)		{ mHaveNewParcelLimitData = have_new_parcel_data;		}		// Remove this once hidden AV feature is fully available grid-wide
 
 	void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
@@ -377,7 +377,7 @@ public:
 	const LLVector3& getUserLocation() const	{ return mUserLocation; }
 	const LLVector3& getUserLookAt() const	{ return mUserLookAt; }
 	ELandingType getLandingType() const	{ return mLandingType; }
-	BOOL getHiddenAVs() const			{ return mHiddenAVs;		}
+	BOOL getSeeAVs() const			{ return mSeeAVs;		}
 	BOOL getHaveNewParcelLimitData() const		{ return mHaveNewParcelLimitData;	}
 
 	// User-specified snapshot
@@ -621,7 +621,7 @@ protected:
 	LLVector3 mUserLocation;
 	LLVector3 mUserLookAt;
 	ELandingType mLandingType;
-	BOOL mHiddenAVs;				// Avatars are hidden on this parcel from outside it
+	BOOL mSeeAVs;							// Avatars on this parcel are visible from outside it
 	BOOL mHaveNewParcelLimitData;			// Remove once hidden AV feature is grid-wide
 	LLTimer mSaleTimerExpires;
 	LLTimer mMediaResetTimer;
diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h
index a85a6a51b3..b1a917df73 100644
--- a/indra/llinventory/llparcelflags.h
+++ b/indra/llinventory/llparcelflags.h
@@ -127,6 +127,6 @@ const S32 PARCEL_DETAILS_OWNER = 2;
 const S32 PARCEL_DETAILS_GROUP = 3;
 const S32 PARCEL_DETAILS_AREA = 4;
 const S32 PARCEL_DETAILS_ID = 5;
-const S32 PARCEL_DETAILS_HIDDEN_AVS = 6;
+const S32 PARCEL_DETAILS_SEE_AVATARS = 6;
 
 #endif