diff options
| author | callum <none@none> | 2011-03-09 15:34:43 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-03-09 15:34:43 -0800 |
| commit | aac70bccada903098bd5a5074d7c4e347ddbef03 (patch) | |
| tree | 66d7626379646f2eb385566e5d5098e95ebb3cd2 /indra/llui/lllayoutstack.cpp | |
| parent | 90c824d10dbf4468dfdd9ffebf7456f81964391a (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -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 |