diff options
| author | callum <none@none> | 2011-10-14 15:22:10 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-14 15:22:10 -0700 |
| commit | bfda156022df272cda390e22dd31937b74eceb39 (patch) | |
| tree | 202cf50815a6304d4262955a1c097d80641452b5 /indra/llui/lldockcontrol.cpp | |
| parent | baed4d8f4338e8788d1948af4c49d01fc8f32a98 (diff) | |
| parent | bdf6363e6aa4216913607e83bfc5e159f2535407 (diff) | |
merge with head
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index 6e39fcd714..6397bbd0de 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -92,7 +92,7 @@ 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() |