diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 18:12:58 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 18:12:58 +0000 |
| commit | 1c67e8f386d69e06c1ff820eb551b3c69592ff89 (patch) | |
| tree | 6e3d565e5f5c1bbe4d974f0c9a4dc5e1af607692 /indra/llui | |
| parent | 675b15948c5169ce07dec83a0f730e6a5b9d57d8 (diff) | |
| parent | 7f432e085809a354ce0599c53c8f1f1eec52e18e (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llbutton.h | 2 | ||||
| -rw-r--r-- | indra/llui/llsearcheditor.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 8f35db1007..6a0d8ef3d6 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -257,6 +257,8 @@ public: void setForcePressedState(bool b) { mForcePressedState = b; } + void setAutoResize(bool auto_resize) { mAutoResize = auto_resize; } + protected: LLPointer<LLUIImage> getImageUnselected() const { return mImageUnselected; } LLPointer<LLUIImage> getImageSelected() const { return mImageSelected; } diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp index 491eeeab54..e6c5e3f334 100644 --- a/indra/llui/llsearcheditor.cpp +++ b/indra/llui/llsearcheditor.cpp @@ -155,7 +155,7 @@ void LLSearchEditor::setFocus( BOOL b ) void LLSearchEditor::onClearButtonClick(const LLSD& data) { - setText(LLStringUtil::null); + mSearchEditor->selectAll(); mSearchEditor->doDelete(); // force keystroke callback } |