summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-03 13:35:44 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-03 13:35:44 -0500
commita9609ae1557a70e095088e0a9b6ef5564dfdb388 (patch)
treef0fd474461afe3857bf6472f0ae896a276af21cb /indra/llui/llfloater.cpp
parent4fb7fd9fffde08ffad4b2fe8f5ead5e500d76419 (diff)
parentb05ebd89775792762063d3af08f0fe9ae785454a (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 36a9e0a650..a63187678e 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1452,6 +1452,7 @@ void LLFloater::onClickTearOff(LLFloater* self)
gFloaterView->adjustToFitScreen(self, FALSE);
// give focus to new window to keep continuity for the user
self->setFocus(TRUE);
+ self->setTornOff(true);
}
else //Attach to parent.
{
@@ -1463,6 +1464,7 @@ void LLFloater::onClickTearOff(LLFloater* self)
// make sure host is visible
new_host->openFloater(new_host->getKey());
}
+ self->setTornOff(false);
}
}