From 089fc07d207c71ce1401e72f09c31ad8c45872e2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:58 -0500
Subject: Second Life viewer sources 1.17.0.12

---
 linden/indra/llinventory/llparcel.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'linden/indra/llinventory/llparcel.cpp')

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 5b2052f..990e77d 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -316,6 +316,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)
@@ -712,6 +717,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);
@@ -1104,6 +1119,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";
-- 
cgit v1.1