diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:57:52 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:57:52 +0000 |
| commit | b5f9e437ea17dd9f1f3e186d6f2bf7108c279ce1 (patch) | |
| tree | f5a73b7cab3cbe4e4dcf112bc34339472a74e83a /indra/llui | |
| parent | 67af47fd8676718aff3f75d28b1cd9dd77e2ca3e (diff) | |
| parent | 8e134590e6651ba36ba9d38ccf10fae249645299 (diff) | |
PE 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 } |