diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
| commit | 6480612a91b0e72fa746d294d8cade4f093c9372 (patch) | |
| tree | 8d43a33390938c371fbbc5da804bc2def61a3cef /indra/newview/llfloaterland.cpp | |
| parent | 2f0d9b78d28deba58988012a9940cb4f232ec2f9 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge 3.6.9 ShareStorm
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rwxr-xr-x | indra/newview/llfloaterland.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index abe094d748..6c8e81e563 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; @@ -2548,7 +2545,7 @@ void LLPanelLandAccess::refresh_ui() getChildView("remove_allowed")->setEnabled(FALSE); getChildView("add_banned")->setEnabled(FALSE); getChildView("remove_banned")->setEnabled(FALSE); - + LLParcel *parcel = mParcel->getParcel(); if (parcel) { @@ -2656,7 +2653,7 @@ void LLPanelLandAccess::onCommitPublicAccess(LLUICtrl *ctrl, void *userdata) { return; } - + onCommitAny(ctrl, userdata); } |