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

STORM-1933: Certain show in search categories for parcels will not stay selected

meow-7.2.2
Ansariel 2013-02-23 02:01:07 +01:00
parent 8d4b0b9246
commit f3025b0ae4
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -175,6 +175,7 @@ Ansariel Hiller
STORM-1685
STORM-1713
STORM-1899
STORM-1933
Aralara Rajal
Ardy Lay
STORM-859

10
indra/newview/llfloaterland.cpp
View File

@ -2104,9 +2104,8 @@ void LLPanelLandOptions::refreshSearch()
mCheckShowDirectory->set(FALSE);
mCheckShowDirectory->setEnabled(FALSE);
// *TODO:Translate
const std::string& none_string = LLParcel::getCategoryUIString(LLParcel::C_NONE);
mCategoryCombo->setSimple(none_string);
const std::string& none_string = LLParcel::getCategoryString(LLParcel::C_NONE);
mCategoryCombo->setValue(none_string);
mCategoryCombo->setEnabled(FALSE);
return;
}
@ -2133,10 +2132,9 @@ void LLPanelLandOptions::refreshSearch()
mCheckShowDirectory ->set(show_directory);
// Set by string in case the order in UI doesn't match the order by index.
// *TODO:Translate
LLParcel::ECategory cat = parcel->getCategory();
const std::string& category_string = LLParcel::getCategoryUIString(cat);
mCategoryCombo->setSimple(category_string);
const std::string& category_string = LLParcel::getCategoryString(cat);
mCategoryCombo->setValue(category_string);
std::string tooltip;
bool enable_show_directory = false;

2
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -1365,7 +1365,7 @@ Only large parcels can be listed in search.
<combo_box.item
label="Any Category"
name="item0"
value="any" />
value="none" />
<combo_box.item
label="Linden Location"
name="item1"