diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-29 12:54:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-29 12:54:52 -0400 |
| commit | f3043428b02d5f8874551e03dfc9bd1109be3494 (patch) | |
| tree | c07deeaceb57899dffe9233863be55b540699f36 | |
| parent | 3364614f8b3c61a369760b4effc2ed9382be75f9 (diff) | |
| parent | f3025b0ae4a2ff714cca68f69d0aa06aed925c1f (diff) | |
merge changes for storm-1933
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloaterland.cpp | 10 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_about_land.xml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 848a5d7574..7719670861 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -176,6 +176,7 @@ Ansariel Hiller STORM-1713 STORM-1899 STORM-1932 + STORM-1933 MAINT-2368 STORM-1931 MAINT-2773 diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index d4355007c1..f6d4f9a605 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2106,9 +2106,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; } @@ -2135,10 +2134,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 100755 --- 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" |