livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made it possible to search for experiences with an empty search string, and show experiences with blank names as (untitled experience) for ACME-1585

meow-7.2.2
Cho 2014-08-20 01:11:27 +01:00
parent 55ed311737
commit 89eac2548a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llurlentry.cpp
View File

@ -1235,7 +1235,8 @@ std::string LLUrlEntryExperienceProfile::getLabel( const std::string &url, const
const LLSD& experience_details = LLExperienceCache::get(experience_id);
if(!experience_details.isUndefined())
{
return experience_details[LLExperienceCache::NAME].asString();
std::string experience_name_string = experience_details[LLExperienceCache::NAME].asString();
return experience_name_string.empty() ? LLTrans::getString("ExperienceNameUntitled") : experience_name_string;
}
addObserver(experience_id_string, url, cb);

4
indra/newview/llpanelexperiencepicker.cpp
View File

@ -108,7 +108,7 @@ BOOL LLPanelExperiencePicker::postBuild()
getChild<LLLineEditor>(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<LLScrollListCtrl>(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()

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -4028,6 +4028,7 @@ Try enclosing path to the editor with double quotes.
<!-- Experience Tools strings -->
<string name="experience_tools_experience">Experience</string>
<string name="ExperienceNameNull">(no experience)</string>
<string name="ExperienceNameUntitled">(untitled experience)</string>
<string name="GRID_WIDE">Grid-wide</string>
<string name="Allowed_Experiences_Tab">ALLOWED</string>
<string name="Blocked_Experiences_Tab">BLOCKED</string>