diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-09 21:17:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-09 21:17:29 -0800 |
| commit | 18a66fb7618c80108d224c9b1c3ff14cc5f3a87f (patch) | |
| tree | 6ff3da645b7d076f4dee2538c6d596e681c90a90 /indra/llui/lldockcontrol.cpp | |
| parent | 7f42c02cad9dbd068bc49bed4b6cd18fd8fff606 (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Pull from viewer-development
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
| -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) { |