diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 11:15:56 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 11:15:56 +0200 |
| commit | 7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (patch) | |
| tree | 9ca8e77a8b67f85a959a867ea9f400c7c11746a2 /indra/llui | |
| parent | ff4b80f27126adfc11e6facfa53aa1fafd3d19ec (diff) | |
| parent | a359db96eb0273bf67fe48bae2665ea65831cf67 (diff) | |
merge
--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() |