diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-11 16:31:36 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-11 16:31:36 +0200 |
| commit | a3ee1dda2049f7e5e3b6b8112aec1ab499c30695 (patch) | |
| tree | 44e25996ccb7ec8b27458931f8ea8cedd62c7592 /indra/newview/llfloaterland.cpp | |
| parent | 178ce6df01b0e73476fbde03d7c72622c443f5b7 (diff) | |
| parent | 9f0e4f668395eb7b55cb48a949e3aebcf46f1bcd (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 7a4a12d3dc..66bf5246b0 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2299,7 +2299,7 @@ void LLPanelLandAccess::refresh() mListBanned->deleteAllItems(); LLParcel *parcel = mParcel->getParcel(); - + // Display options if (parcel) { @@ -2395,22 +2395,40 @@ void LLPanelLandAccess::refresh() mListBanned->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix); } } + + LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); + if(region) + { + std::string region_access = "("; + region_access += region->getSimAccessString(); + region_access += ")"; + childSetLabelArg( "public_access", "[MATURITY]", region_access ); + } + else + { + childSetLabelArg( "public_access", "[MATURITY]", std::string() ); + } + if(parcel->getRegionDenyAnonymousOverride()) { childSetValue("limit_payment", TRUE); + childSetLabelArg( "limit_payment", "[ESTATE_PAYMENT_LIMIT]", getString("access_estate_defined") ); } else { childSetValue("limit_payment", (parcel->getParcelFlag(PF_DENY_ANONYMOUS))); + childSetLabelArg( "limit_payment", "[ESTATE_PAYMENT_LIMIT]", std::string() ); } if(parcel->getRegionDenyAgeUnverifiedOverride()) { childSetValue("limit_age_verified", TRUE); + childSetLabelArg( "limit_age_verified", "[ESTATE_AGE_LIMIT]", getString("access_estate_defined") ); } else { childSetValue("limit_age_verified", (parcel->getParcelFlag(PF_DENY_AGEUNVERIFIED))); + childSetLabelArg( "limit_age_verified", "[ESTATE_AGE_LIMIT]", std::string() ); } BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST); |