summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-07 13:50:30 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-07 13:50:30 -0500
commitee159d8e742a7281f304fc45b692c111706d294e (patch)
tree362eb9968fa778bfdd4a300b6a0b642818a973be /indra/llui
parent3ddd6ad286c5cf24dbfd6b5e46fcb23f9ac25e19 (diff)
parent83fbe4a631ed04d620b0da2fe58b92d74764183f (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llsearcheditor.cpp9
-rw-r--r--indra/llui/llsearcheditor.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index fad2b7bc99..6fa99df82e 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -141,6 +141,15 @@ void LLSearchEditor::clear()
}
}
+//virtual
+void LLSearchEditor::setFocus( BOOL b )
+{
+ if (mSearchEditor)
+ {
+ mSearchEditor->setFocus(b);
+ }
+}
+
void LLSearchEditor::onClearButtonClick(const LLSD& data)
{
setText(LLStringUtil::null);
diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h
index f395e7e816..bd2d595174 100644
--- a/indra/llui/llsearcheditor.h
+++ b/indra/llui/llsearcheditor.h
@@ -83,6 +83,7 @@ public:
virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
virtual void setLabel( const LLStringExplicit &new_label );
virtual void clear();
+ virtual void setFocus( BOOL b );
void setKeystrokeCallback( commit_callback_t cb ) { mKeystrokeCallback = cb; }