diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
| commit | 6258f8d2e263e586b58d655bb32804f9079ace1d (patch) | |
| tree | 9294cfe1cea68b16fbd67bc731379cb0ba921263 /indra/llui/lldockcontrol.cpp | |
| parent | 5a14e3979cd52387e66a4c594e844c13f513e509 (diff) | |
| parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) | |
Merge with 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) { |