diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-02-01 18:25:58 +0200 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-02-01 18:25:58 +0200 |
| commit | 7bcba326b32e1aca678edfb4495d1e2d4d44cb71 (patch) | |
| tree | 29029705ec17e7778b6b11542f46d4d8b4fcdc2c /indra/llui | |
| parent | d5e97617c661dd3518ef1caa6903867ad044df8d (diff) | |
Fixed major bug EXT-4798 (Voice notifications steal keyboard focus by default)
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 74438b184a..57baf28dab 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -146,7 +146,7 @@ void LLDockableFloater::setVisible(BOOL visible) if (visible) { - LLFloater::setFrontmost(TRUE); + LLFloater::setFrontmost(getAutoFocus()); } LLFloater::setVisible(visible); } diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 8c9dacbd20..2166d8db8a 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -301,6 +301,7 @@ protected: const LLRect& getExpandedRect() const { return mExpandedRect; } void setAutoFocus(BOOL focus) { mAutoFocus = focus; } // whether to automatically take focus when opened + BOOL getAutoFocus() const { return mAutoFocus; } LLDragHandle* getDragHandle() const { return mDragHandle; } void destroy() { die(); } // Don't call this directly. You probably want to call closeFloater() |