diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
| commit | ae464867e6714816cd5bdaeecdd1d3c0a0817e58 (patch) | |
| tree | 02830da2f640dab402a7e7222b4f0aa6eca930b2 /indra/llinventory | |
| parent | 40d2bb564d35809d7735d2ec06ba988db7327020 (diff) | |
svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 6 | ||||
| -rw-r--r-- | indra/llinventory/llparcel.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index ecf013f042..489798910d 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -1190,8 +1190,10 @@ 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 use_estate_voice_chan " << (getParcelFlagUseEstateVoiceChannel() ? 1 : 0) << "\n"; + + output_stream << "\t\t allow_voice_chat " << (getParcelFlagAllowVoice() ? 1 : 0) << "\n"; + output_stream << "\t\t use_estate_voice_chan " << (getParcelFlagUseEstateVoiceChannel() ? 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 716802b2dc..2a0ddc4ba8 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -444,9 +444,9 @@ public: { return (mParcelFlags & PF_FOR_SALE) ? TRUE : FALSE; } BOOL getSoundLocal() const { return (mParcelFlags & PF_SOUND_LOCAL) ? TRUE : FALSE; } - BOOL getVoiceEnabled() const + BOOL getParcelFlagAllowVoice() const { return (mParcelFlags & PF_ALLOW_VOICE_CHAT) ? TRUE : FALSE; } - BOOL getVoiceUseEstateChannel() const + BOOL getParcelFlagUseEstateVoiceChannel() const { return (mParcelFlags & PF_USE_ESTATE_VOICE_CHAN) ? TRUE : FALSE; } BOOL getAllowPublish() const { return (mParcelFlags & PF_ALLOW_PUBLISH) ? TRUE : FALSE; } |