summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-09-30 15:26:48 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-09-30 15:26:48 -0700
commit6fe4815217a11a36aa2e2b1d8b040eff007bb631 (patch)
tree08625ba01881f7964e3892c698425b80c6910b50
parent462f6a00285a92701ecba7cf69d5236f337e0781 (diff)
Updated FUI floater toggle function to handle closing windows that are
initialized with chrome.
-rw-r--r--indra/llui/llfloaterreg.cpp2
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);
}