diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-10-15 17:47:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-10-15 17:47:37 -0400 |
| commit | 9c313aea13c70db145d3f2ba840fdc34ed8c8adf (patch) | |
| tree | 72b76053aac0fedf411145b0427b2239971034b1 /indra/newview/llfloaterland.cpp | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
| parent | 8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff) | |
merge changes for DRTVWR-336
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 6ef4d8717d..8f20d4e082 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; |