diff options
author | callum <none@none> | 2009-12-28 13:45:57 -0800 |
---|---|---|
committer | callum <none@none> | 2009-12-28 13:45:57 -0800 |
commit | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (patch) | |
tree | 5d590d84a1fa6c8414adba0732a83a67a440dd37 /indra/llui/lldockablefloater.cpp | |
parent | dd1fb1568e85a8e3622372cae21bcd3205051718 (diff) | |
parent | 6008bf61b2d0475a274ad2b851b61e69496b5bf8 (diff) |
Merge with (specific revision) and head
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
-rw-r--r-- | indra/llui/lldockablefloater.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 63faf44f9d..6a5b475134 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -54,6 +54,7 @@ void LLDockableFloater::init(LLDockableFloater* thiz) LLDockableFloater::LLDockableFloater(LLDockControl* dockControl, const LLSD& key, const Params& params) : LLFloater(key, params), mDockControl(dockControl), mUniqueDocking(true) + , mOverlapsScreenChannel(false) { init(this); } |