diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-03 17:13:14 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-03 17:13:14 -0700 |
| commit | 99ada9b047d1cda8f45ec7f193ec04328496a721 (patch) | |
| tree | 03daf2f4ab56de43b03f4f7b0963abe041ad67ec /indra/llui/llfloaterreg.cpp | |
| parent | cd467cc34f876920b35d3570f50dbad54ce4a42c (diff) | |
| parent | 37fdd27bcbd38b5cf22e0ff003f4d01b908996c7 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 8a0513f246..27e96856b3 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -483,7 +483,7 @@ void LLFloaterReg::toggleToolbarFloaterInstance(const LLSD& sdname) { showInstance(name, key, TRUE); } - else if (!instance->hasFocus()) + else if (!instance->hasFocus() && !instance->getIsChrome()) { instance->setFocus(TRUE); } |