diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-30 10:01:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-30 10:01:53 +0100 |
| commit | 8996a338bd150c37fb2cafdefeba19b6eaf3bcc9 (patch) | |
| tree | ffb78d0abcc13533185749be5272713afda44265 /indra/llui | |
| parent | 0d910e53eed6f4d5646949aa4412820ba8622782 (diff) | |
| parent | c13048fd8aa273fc3a7fe6b69f0a27ffa25eef43 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 2 |
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; |