diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-20 15:04:21 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-20 15:04:21 -0500 |
| commit | 64530c24c85b0c3f177c07ee5342d08b8822adc6 (patch) | |
| tree | 9a0cfae808c5ff4f4ce89b09b0a445f345398193 /indra/llui | |
| parent | 1675dc02b5b4ae236e1e03157753eadf7ac341c3 (diff) | |
| parent | 36f708de17c64191c79a756ab7eedc3badac9828 (diff) | |
merge latest tweaks to viewer-hotfix; resolved conflict in llsearcheditor in favor of the one that does less processing
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llsearcheditor.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp index e6c5e3f334..8075575bab 100644 --- a/indra/llui/llsearcheditor.cpp +++ b/indra/llui/llsearcheditor.cpp @@ -155,8 +155,8 @@ void LLSearchEditor::setFocus( BOOL b ) void LLSearchEditor::onClearButtonClick(const LLSD& data) { - mSearchEditor->selectAll(); - mSearchEditor->doDelete(); // force keystroke callback + setText(LLStringUtil::null); + mSearchEditor->onCommit(); // force keystroke callback } void LLSearchEditor::handleKeystroke() diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 9a715cca0b..07e4cc22e0 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -215,7 +215,7 @@ LLTabContainer::Params::Params() use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), use_ellipses("use_ellipses"), - font_halign("font_halign") + font_halign("halign") { name(std::string("tab_container")); mouse_opaque = false; |