diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:19:39 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:19:39 -0700 |
| commit | bce92b3ec6d3efb4a2938f35ba7e1803b4b57145 (patch) | |
| tree | 76c0ded54ebe614d74d4ad4b577d41abc2630c3a /indra/llui/lldockcontrol.cpp | |
| parent | d63c1a4df14f5eaeee37b82890a445e912d60683 (diff) | |
| parent | 741de388d38290cbb946070a8380f492971dfd2e (diff) | |
Pull in merov_linden/viewer-autobuild2010
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) { |