diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-11 14:33:24 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-11 14:33:24 -0800 |
| commit | 3011e697c34ac6ad1ce95b435c487f8da20fb5e2 (patch) | |
| tree | 57fef4c1a3430c07cf1cb682c1a1784282cad7d3 /indra/llui/lllayoutstack.cpp | |
| parent | e342c522b4bb5efd8eb9687efddfe47199e02395 (diff) | |
| parent | d0b457365145233c3b4bc64991b183722b13fac8 (diff) | |
Merge
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 |