diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 2 | 
2 files changed, 5 insertions, 7 deletions
| diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index be743d57d2..9a1274bf3b 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -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; diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 793a6e6fa1..a660e812cc 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -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" | 
