diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/newview/llpanelplaceprofile.cpp | |
parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) |
merge up to 3.5.2 development
Diffstat (limited to 'indra/newview/llpanelplaceprofile.cpp')
-rw-r--r-- | indra/newview/llpanelplaceprofile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 83b70d9f29..5d9971c16c 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -568,7 +568,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, mTerraformLimitsText->setText(parcel->getAllowTerraform() ? on : off); - if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES) + if (region->getRegionFlag(REGION_FLAGS_ALLOW_PARCEL_CHANGES)) { mSubdivideText->setText(getString("can_change")); } @@ -576,7 +576,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, { mSubdivideText->setText(getString("can_not_change")); } - if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL) + if (region->getRegionFlag(REGION_FLAGS_BLOCK_LAND_RESELL)) { mResaleText->setText(getString("can_not_resell")); } |