diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-19 14:11:34 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-19 14:11:34 -0700 |
| commit | b477f3c9af39dd49fcdb88f330f60c8b166fa0e8 (patch) | |
| tree | d04b72a8ce62dee897c626a3bc5374b67eb2649f /indra/llui/llfloaterreg.cpp | |
| parent | b8e954f98d37cb8e045135dd6bbaab9fc4421529 (diff) | |
| parent | 3e61b37258fc88916d45ee47a2a9fbb3baf934cf (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 0edfc8da2d..df3cff9968 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -462,16 +462,16 @@ void LLFloaterReg::toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& else if (instance->isMinimized()) { instance->setMinimized(FALSE); - instance->setFocus(TRUE); + instance->setVisibleAndFrontmost(); } else if (!instance->isShown()) { instance->openFloater(key); - instance->setFocus(TRUE); + instance->setVisibleAndFrontmost(); } - else if (!instance->hasFocus() && !instance->getIsChrome()) + else if (!instance->isFrontmost()) { - instance->setFocus(TRUE); + instance->setVisibleAndFrontmost(); } else { |