summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-30 10:01:53 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-30 10:01:53 +0100
commit78c84f86f8c07ca448b24b7df2c29d57eafd0643 (patch)
treeffb78d0abcc13533185749be5272713afda44265 /indra/llui
parentfd81ed9de7b3e97ab1cec2e58190ee5deb7a4a65 (diff)
parent7fcca83169287b5011b5b5a0193456e9a789619c (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lldockablefloater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index 3d8670fef2..4f5fcddbf4 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -49,12 +49,12 @@ void LLDockableFloater::init(LLDockableFloater* thiz)
thiz->setCanClose(TRUE);
thiz->setCanDock(true);
thiz->setCanMinimize(TRUE);
+ thiz->setOverlapsScreenChannel(false);
}
LLDockableFloater::LLDockableFloater(LLDockControl* dockControl,
const LLSD& key, const Params& params) :
LLFloater(key, params), mDockControl(dockControl), mUniqueDocking(true)
- , mOverlapsScreenChannel(false)
{
init(this);
mUseTongue = true;