6 files changed, 58 insertions, 22 deletions

diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 47dd690..86eb5b2 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -104,12 +104,6 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
                         goto import_file_failed;
                 }
 
-                if( (index < 0) )
-                {
-                        llwarns << "Invalid LLEmbeddedItems file format: invalid ext char index: " << index << llendl;
-                        goto import_file_failed;
-                }
-
                 str >> std::ws >> "inv_item\t0\n";
                 if(str.fail())
                 {
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";
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 3144eb9..371b802 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -167,21 +167,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
@@ -211,7 +229,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);
@@ -410,6 +428,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/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 17d9151..38d49fe 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -61,7 +61,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;
 
@@ -83,7 +84,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);
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 9364529..debb092 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -175,7 +175,7 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
                         buffer,
                         " %254s %254s",
                         keyword, valuestr);
-                if(!keyword)
+                if(!keyword[0])
                 {
                         continue;
                 }
@@ -231,7 +231,7 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m
                         buffer,
                         " %254s %254s",
                         keyword, valuestr);
-                if(!keyword)
+                if(!keyword[0])
                 {
                         continue;
                 }
diff --git a/linden/indra/llinventory/lluserrelations.h b/linden/indra/llinventory/lluserrelations.h
index 430dc43..3895533 100644
--- a/linden/indra/llinventory/lluserrelations.h
+++ b/linden/indra/llinventory/lluserrelations.h
@@ -38,7 +38,7 @@
  * @class LLRelationship
  *
  * This class represents a relationship between two agents, where the
- * related agent is stored and the other agent is the relationship is
+ * related agent is stored and the other agent in the relationship is
  * implicit by container ownership.
  * This is merely a cache of this information used by the sim 
  * and viewer.