summaryrefslogtreecommitdiff
path: root/indra/llui/lldockcontrol.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-13 08:57:53 -0400
committerOz Linden <oz@lindenlab.com>2011-03-13 08:57:53 -0400
commitb7635b6112b7c7fd448aa4400bba2edbf15a5b0a (patch)
tree71a591c69a0bae36666e96f9ff23dcc563cbb193 /indra/llui/lldockcontrol.cpp
parentc556efbce8e093883a7c7474b1cdac0d53c39cfb (diff)
parent522af96acaf07e098e8ce4a3eb9187a5eaeda6d7 (diff)
pull transplanted crash fix changesets back from viewer-release
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
-rw-r--r--indra/llui/lldockcontrol.cpp4
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)
{