diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-18 16:47:53 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-18 16:47:53 -0700 |
| commit | 4002820badf7326996e22132a835b2b798dfb43c (patch) | |
| tree | 516987f0e97deab5f8e438d1f7ea2d2013822de5 /indra/llui/llfloaterreg.cpp | |
| parent | 4e17d830bad02a1c74e79659686743ecded4538d (diff) | |
| parent | b1016782a20d43c383b2d07660433c05640d39b8 (diff) | |
merge
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 { |