diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
| commit | 57c5d474013793f622ac77a139251a54b056cb00 (patch) | |
| tree | 8cd490d3bb86e74bfcd701ee400bccda74791629 /indra/llui/lldockcontrol.cpp | |
| parent | d3ca4983a4526c7fcf9eb9609e007ded74c47c05 (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
pull 2.5.1 tag back from viewer-release
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) { |