diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:22:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:22:23 -0500 |
| commit | 4ef9277761b5faee2825177112939b72c563a4ea (patch) | |
| tree | c8d207cde2ceca1c8572103152e3fcb48d67c5d9 /indra/newview/llfloaterland.cpp | |
| parent | b2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (diff) | |
| parent | e377182c041359db245e90cfd98836cc22b1d981 (diff) | |
merge changes for vmrg-218
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index d8e4aa03f7..95da8ff948 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2474,27 +2474,6 @@ void LLPanelLandAccess::refresh() mListBanned->addNameItem(entry.mID, ADD_DEFAULT, TRUE, suffix); } } - - LLCheckBoxWithTBAcess* maturity_checkbox = (LLCheckBoxWithTBAcess*) getChild<LLCheckBoxCtrl>( "public_access"); - LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); - if(region) - { - LLTextBox* maturity_textbox = maturity_checkbox->getTextBox(); - insert_maturity_into_textbox(maturity_textbox, gFloaterView->getParentFloater(this), getString("allow_public_access")); - maturity_checkbox->reshape(maturity_checkbox->getRect().getWidth(), maturity_checkbox->getRect().getHeight(), FALSE); - } - else - { - std::string maturity_string = getString("allow_public_access"); - size_t maturity_pos = maturity_string.find(MATURITY); - - if (maturity_pos != std::string::npos) - { - maturity_string.replace(maturity_pos, MATURITY.length(), std::string("")); - } - - maturity_checkbox->setLabel(maturity_string); - } if(parcel->getRegionDenyAnonymousOverride()) { |