diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:22:13 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:22:13 -0700 |
| commit | 15404a3c5d50f5f106f5bc443d16e172c54e3e0f (patch) | |
| tree | 2e25cb610683043143bf8b871e2ddec1021039d3 /indra/llui | |
| parent | 07717a60dc3bce644dc08d7e8b2fa74715b9c7c0 (diff) | |
| parent | be9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff) | |
Merge again
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 19ac4c58a8..9b6830a816 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -563,7 +563,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize) } // update resize bars with new limits - LLResizeBar* last_resize_bar = NULL; + LLLayoutPanel* last_resizeable_panel = NULL; for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it) { LLPanel* panelp = (*panel_it); @@ -585,17 +585,17 @@ void LLLayoutStack::updateLayout(BOOL force_resize) BOOL resize_bar_enabled = panelp->getVisible() && (*panel_it)->mUserResize; (*panel_it)->mResizeBar->setVisible(resize_bar_enabled); - if (resize_bar_enabled) + if ((*panel_it)->mUserResize || (*panel_it)->mAutoResize) { - last_resize_bar = (*panel_it)->mResizeBar; + last_resizeable_panel = (*panel_it); } } // hide last resize bar as there is nothing past it // resize bars need to be in between two resizable panels - if (last_resize_bar) + if (last_resizeable_panel) { - last_resize_bar->setVisible(FALSE); + last_resizeable_panel->mResizeBar->setVisible(FALSE); } // not enough room to fit existing contents |