From 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 Mon Sep 17 00:00:00 2001 From: Cho Date: Wed, 20 Aug 2014 01:11:27 +0100 Subject: Made it possible to search for experiences with an empty search string, and show experiences with blank names as (untitled experience) for ACME-1585 --- indra/newview/llpanelexperiencepicker.cpp | 4 ++-- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp index 0a572a8a5c..7592aaa9d0 100644 --- a/indra/newview/llpanelexperiencepicker.cpp +++ b/indra/newview/llpanelexperiencepicker.cpp @@ -108,7 +108,7 @@ BOOL LLPanelExperiencePicker::postBuild() getChild(TEXT_EDIT)->setKeystrokeCallback( boost::bind(&LLPanelExperiencePicker::editKeystroke, this, _1, _2),NULL); childSetAction(BTN_FIND, boost::bind(&LLPanelExperiencePicker::onBtnFind, this)); - getChildView(BTN_FIND)->setEnabled(FALSE); + getChildView(BTN_FIND)->setEnabled(TRUE); LLScrollListCtrl* searchresults = getChild(LIST_RESULTS); searchresults->setDoubleClickCallback( boost::bind(&LLPanelExperiencePicker::onBtnSelect, this)); @@ -140,7 +140,7 @@ BOOL LLPanelExperiencePicker::postBuild() void LLPanelExperiencePicker::editKeystroke( class LLLineEditor* caller, void* user_data ) { - getChildView(BTN_FIND)->setEnabled(caller->getText().size() > 0); + getChildView(BTN_FIND)->setEnabled(caller->getText().size() >= 0); } void LLPanelExperiencePicker::onBtnFind() diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 72cebb1060..1bf1ee930c 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4028,6 +4028,7 @@ Try enclosing path to the editor with double quotes. Experience (no experience) + (untitled experience) Grid-wide ALLOWED BLOCKED -- cgit v1.2.3