result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release

3 files changed, 55 insertions, 13 deletions

diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index c2b2eb27de..38b0cb06c6 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -296,6 +296,11 @@ void LLParcel::setLocalID(S32 local_id)
 	mLocalID = local_id;
 }
 
+void LLParcel::setAllParcelFlags(U32 flags)
+{
+	mParcelFlags = flags;
+}
+
 void LLParcel::setParcelFlag(U32 flag, BOOL b)
 {
 	if (b)
@@ -692,6 +697,16 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 			LLString::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_GROUP_SCRIPTS, setting);
 		}
+		else if ("allow_voice_chat" == keyword)
+		{
+			LLString::convertToU32(value, setting);
+			setParcelFlag(PF_ALLOW_VOICE_CHAT, setting);
+		}
+		else if ("use_estate_voice_chan" == keyword)
+		{
+			LLString::convertToU32(value, setting);
+			setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, setting);
+		}
 		else if ("allow_scripts" == keyword)
 		{
 			LLString::convertToU32(value, setting);
@@ -1084,6 +1099,8 @@ BOOL LLParcel::exportStream(std::ostream& output_stream)
 	output_stream << "\t\t sound_local	   " << (getSoundLocal() ? 1 : 0)  << "\n";
 	output_stream << "\t\t allow_scripts    " << (getAllowOtherScripts()  ? 1 : 0)  << "\n";
 	output_stream << "\t\t allow_group_scripts    " << (getAllowGroupScripts()  ? 1 : 0)  << "\n";
+	output_stream << "\t\t allow_voice_chat    " << (getVoiceEnabled() ? 1 : 0) << "\n";
+	output_stream << "\t\t use_estate_voice_chan   " << (getVoiceUseEstateChannel() ? 1 : 0) << "\n";
 	output_stream << "\t\t for_sale         " << (getForSale()       ? 1 : 0)  << "\n";
 	output_stream << "\t\t sell_w_objects   " << (getSellWithObjects()	? 1 : 0)  << "\n";
 	output_stream << "\t\t draw_distance    " << mDrawDistance  << "\n";
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index af264731ad..1ad51dfd1e 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -147,21 +147,39 @@ public:
 
 	// CREATORS
 	LLParcel();
-	LLParcel(	const LLUUID &owner_id,
-				BOOL modify, BOOL terraform, BOOL damage,
-				time_t claim_date, S32 claim_price, S32 rent_price, S32 area, S32 sim_object_limit, F32 parcel_object_bonus,
-				BOOL is_group_owned = FALSE);
+	LLParcel(
+		const LLUUID &owner_id,
+		BOOL modify,
+		BOOL terraform,
+		BOOL damage,
+		time_t claim_date,
+		S32 claim_price,
+		S32 rent_price,
+		S32 area,
+		S32 sim_object_limit,
+		F32 parcel_object_bonus,
+		BOOL is_group_owned = FALSE);
 	virtual ~LLParcel();
 
-	void	init(	const LLUUID &owner_id,
-					BOOL modify, BOOL terraform, BOOL damage,
-					time_t claim_date, S32 claim_price, S32 rent_price,
-					S32 area, S32 sim_object_limit, F32 parcel_object_bonus, BOOL is_group_owned = FALSE);
+	void init(
+		const LLUUID &owner_id,
+		BOOL modify,
+		BOOL terraform,
+		BOOL damage,
+		time_t claim_date,
+		S32 claim_price,
+		S32 rent_price,
+		S32 area,
+		S32 sim_object_limit,
+		F32 parcel_object_bonus,
+		BOOL is_group_owned = FALSE);
 
 	// TODO: make an actual copy constructor for this
-	void	overrideParcelFlags(U32 flags);
+	void overrideParcelFlags(U32 flags);
 	// if you specify an agent id here, the group id will be zeroed
-	void	overrideOwner(const LLUUID& owner_id, BOOL is_group_owned = FALSE);
+	void overrideOwner(
+		const LLUUID& owner_id,
+		BOOL is_group_owned = FALSE);
 	void overrideSaleTimerExpires(F32 secs_left) { mSaleTimerExpires.setTimerExpirySec(secs_left); }
 
 	// MANIPULATORS
@@ -191,7 +209,7 @@ public:
 
 	void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
 
-	void	setAllParcelFlags(U32 flags) { mParcelFlags = flags; }
+	void	setAllParcelFlags(U32 flags);
 	void	setParcelFlag(U32 flag, BOOL b);
 
 	void	setArea(S32 area, S32 sim_object_limit);
@@ -390,6 +408,10 @@ public:
 					{ return (mParcelFlags & PF_FOR_SALE) ? TRUE : FALSE; }
 	BOOL	getSoundLocal() const
 					{ return (mParcelFlags & PF_SOUND_LOCAL) ? TRUE : FALSE; }
+	BOOL	getVoiceEnabled() const
+					{ return (mParcelFlags & PF_ALLOW_VOICE_CHAT) ? TRUE : FALSE; }
+	BOOL	getVoiceUseEstateChannel() const
+					{ return (mParcelFlags & PF_USE_ESTATE_VOICE_CHAN) ? TRUE : FALSE; }
 	BOOL	getAllowPublish() const
 					{ return (mParcelFlags & PF_ALLOW_PUBLISH) ? TRUE : FALSE; }
 	BOOL	getMaturePublish() const
diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h
index 43571abe77..d78f9b630b 100644
--- a/indra/llinventory/llparcelflags.h
+++ b/indra/llinventory/llparcelflags.h
@@ -41,7 +41,8 @@ const U32 PF_ALLOW_GROUP_SCRIPTS		= 1 << 25;	// Allow scripts owned by group
 const U32 PF_CREATE_GROUP_OBJECTS		= 1 << 26;	// Allow object creation by group members or objects
 const U32 PF_ALLOW_ALL_OBJECT_ENTRY		= 1 << 27;	// Allow all objects to enter a parcel
 const U32 PF_ALLOW_GROUP_OBJECT_ENTRY	= 1 << 28;	// Only allow group (and owner) objects to enter the parcel
-
+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;
 
@@ -63,7 +64,9 @@ const U32 PF_DEFAULT =  PF_ALLOW_FLY
 						| PF_CREATE_GROUP_OBJECTS
 						| PF_USE_BAN_LIST
 						| PF_ALLOW_ALL_OBJECT_ENTRY
-						| PF_ALLOW_GROUP_OBJECT_ENTRY;
+						| PF_ALLOW_GROUP_OBJECT_ENTRY
+                        | PF_ALLOW_VOICE_CHAT
+                        | PF_USE_ESTATE_VOICE_CHAN;
 
 // Access list flags
 const U32 AL_ACCESS  = (1 << 0);