diff options
| author | prep <prep@lindenlab.com> | 2011-03-10 12:10:29 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-03-10 12:10:29 -0500 |
| commit | 55dbd0c4f3c1cc3598d3d8428dea4a2645b211c4 (patch) | |
| tree | b7b67fd048fda99511042040cf91ac2ae309e728 /indra/llui/lldockcontrol.cpp | |
| parent | 79664c1017175b2cdfdc4b16c5894bdfdf6e8188 (diff) | |
| parent | ca610bfc82e9f150877efa7e8c4e972d47bce7d4 (diff) | |
merge
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) { |