diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 10:47:55 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 10:47:55 -0400 |
| commit | 444bdef6d4949b6381b8706ab056588bc6bd88eb (patch) | |
| tree | 1f72cc9ec78d7b8c4bad57f4ef14c12a04b7a3a0 /indra/llui/lldockcontrol.cpp | |
| parent | af0be560002d4de4d9d89709b5d3b4cc1aef31fc (diff) | |
| parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) | |
merge
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index b1c27126d9..6397bbd0de 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -92,11 +92,12 @@ void LLDockControl::setDock(LLView* dockWidget) void LLDockControl::getAllowedRect(LLRect& rect) { - rect = mDockableFloater->getRootView()->getRect(); + rect = mDockableFloater->getRootView()->getChild<LLView>("non_toolbar_panel")->getRect(); } void LLDockControl::repositionDockable() { + if (!mDockWidget) return; LLRect dockRect = mDockWidget->calcScreenRect(); LLRect rootRect; mGetAllowedRectCallback(rootRect); @@ -160,7 +161,7 @@ bool LLDockControl::isDockVisible() case TOP: { // check is dock inside parent rect - // assume that parent for all dockable flaoters + // assume that parent for all dockable floaters // is the root view LLRect dockParentRect = mDockWidget->getRootView()->calcScreenRect(); |