diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 12:31:25 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 12:31:25 +0000 |
| commit | ef5cbcb0604cbffbb6c153a433411fedcf4e5831 (patch) | |
| tree | 06ff2fa6856e43b37a78b2dfa64e56008ce91b5c /indra/newview/llpanelplaceprofile.cpp | |
| parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) | |
| parent | d2c2d3f58e8d150c993708cbf13fc584a557ced7 (diff) | |
Merge from viewer2.
Diffstat (limited to 'indra/newview/llpanelplaceprofile.cpp')
| -rw-r--r-- | indra/newview/llpanelplaceprofile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 8d689b2c5e..9b31ef23a2 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -341,7 +341,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, std::string off = getString("off"); // Processing parcel characteristics - if (parcel->getParcelFlagAllowVoice()) + if (region->isVoiceEnabled() && parcel->getParcelFlagAllowVoice()) { mVoiceIcon->setValue(icon_voice); mVoiceText->setText(on); @@ -385,9 +385,9 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, mBuildText->setText(off); } - if((region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS) || - (region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS) || - !parcel->getAllowOtherScripts()) + if ((region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS) || + (region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS) || + !parcel->getAllowOtherScripts()) { mScriptsIcon->setValue(icon_scripts_no); mScriptsText->setText(off); |