diff options
| author | Tofu Buzzard <no-email> | 2011-03-09 10:55:19 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-09 10:55:19 -0800 |
| commit | 75e938cd75d82fcea7d58c556abf403b3629283e (patch) | |
| tree | 7d3caeea5519dcb914f6219b6b9de85bae67558f /indra/llui/lldockcontrol.cpp | |
| parent | ceb8561e49ace81d39209849a6f8a805d2d9d8ed (diff) | |
| parent | c8293e29caf4701f130141a88b90709a09143d4e (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) { |