diff options
| author | simon <none@none> | 2013-10-23 14:14:36 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-10-23 14:14:36 -0700 |
| commit | 64c5afa196d1692cd0823ccd555f1f7bb32f529d (patch) | |
| tree | c0ee113ee6aae7009446756f4c10188134ea7179 /indra/newview/llfloaterland.cpp | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge latest viewer-release with FBC
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rwxr-xr-x | indra/newview/llfloaterland.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index abe094d748..2b9c216e54 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2097,7 +2097,6 @@ void LLPanelLandOptions::refresh() // virtual void LLPanelLandOptions::draw() { - refreshSearch(); // Is this necessary? JC LLPanel::draw(); } @@ -2111,9 +2110,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; } @@ -2140,10 +2138,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; |