diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-08 16:06:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-08 16:06:29 -0800 |
| commit | 7dc7754ed3de9ed621e2ea3964cea972fbf7b27b (patch) | |
| tree | fd45ea286353c046362b0b04b354a37b4bb31f43 /indra/llui | |
| parent | a07e6c625108988ad664df70a1842b53c843f223 (diff) | |
| parent | 3810a391d018f480487e8012654b9b75d3525ced (diff) | |
STORM-494 : pull into viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index f6f5a0beb3..5ed2c27160 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -160,8 +160,10 @@ bool LLDockControl::isDockVisible() case TOP: { // check is dock inside parent rect + // assume that parent for all dockable flaoters + // is the root view LLRect dockParentRect = - mDockWidget->getParent()->calcScreenRect(); + mDockWidget->getRootView()->calcScreenRect(); if (dockRect.mRight <= dockParentRect.mLeft || dockRect.mLeft >= dockParentRect.mRight) { |