diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-26 17:36:07 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-26 17:36:07 -0700 |
| commit | a465f816b8e7674aa3f22023d7708106ca35b350 (patch) | |
| tree | a9c767df415ba156b7528a27ffb06402002e08db /indra/llui/lldockcontrol.cpp | |
| parent | 16fead6429eba35bdfb8ef01610780a508e062df (diff) | |
EXP-1239 FIX make toolbars wrap when there is not enough room
toolbars resize to fit buttons
toolbar view uses layout stacks to organize toolbars
reviewed by Leslie
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index b1c27126d9..6e39fcd714 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -97,6 +97,7 @@ void LLDockControl::getAllowedRect(LLRect& rect) 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(); |