summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaceprofile.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-12-11 16:38:10 -0500
committerLogan Dethrow <log@lindenlab.com>2012-12-11 16:38:10 -0500
commit03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch)
treed48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/newview/llpanelplaceprofile.cpp
parentedcdce226a7ff599e43c89fe7e4d37350650ae96 (diff)
parent798377b076fbce895ba2075417107de0da10b9ca (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llpanelplaceprofile.cpp')
-rw-r--r--indra/newview/llpanelplaceprofile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index ce8057eead..884de65dd8 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -572,7 +572,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"));
}
@@ -580,7 +580,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"));
}