diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-05 15:51:50 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-05 15:51:50 +0000 |
| commit | 8922c46ecf63c127053dfdf1b16834864c8f9264 (patch) | |
| tree | e5a42d08a27e720f824781a6a57c56445b7c3089 /indra/newview/llsettingspicker.cpp | |
| parent | 863dc917ac1fc9ea4342c130a1f79c137e525c1a (diff) | |
| parent | aa43ddf674e672262428c400c076cc26966aedf9 (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #131)
SL-9808, SL-9819 and SL-9821 fixes
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llsettingspicker.cpp')
| -rw-r--r-- | indra/newview/llsettingspicker.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp index 6b1254ae9e..b82be3a23e 100644 --- a/indra/newview/llsettingspicker.cpp +++ b/indra/newview/llsettingspicker.cpp @@ -48,7 +48,6 @@ namespace const std::string FLT_INVENTORY_SEARCH("flt_inventory_search"); const std::string PNL_INVENTORY("pnl_inventory"); - const std::string CHK_SHOWFOLDERS("chk_showfolders"); const std::string BTN_SELECT("btn_select"); const std::string BTN_CANCEL("btn_cancel"); @@ -92,9 +91,6 @@ BOOL LLFloaterSettingsPicker::postBuild() setTitle(pick + mLabel); } -// childSetCommitCallback(CHK_SHOWFOLDERS, onShowFolders, this); - getChildView(CHK_SHOWFOLDERS)->setVisible(FALSE); - mFilterEdit = getChild<LLFilterEditor>(FLT_INVENTORY_SEARCH); mFilterEdit->setCommitCallback([this](LLUICtrl*, const LLSD& param){ onFilterEdit(param.asString()); }); |