diff options
author | Richard Linden <none@none> | 2011-10-18 14:09:52 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-10-18 14:09:52 -0700 |
commit | 30527b2206e7fce2890c3c44825ff0bef85aa5a0 (patch) | |
tree | 513c249509d4081f6d8aaf2f5ae9279034b415e1 /indra/llui/llfloaterreg.cpp | |
parent | 591ad2bde7e0acca5eb38e7c29edf8f88d1488b4 (diff) |
EXP-1409 FIX WASD controls don't move avatar while Move floater is in focus
moved "chrome" flags to xui
separated hiding floater title from setting chrome
toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
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 { |