diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-09 11:24:54 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-09 11:24:54 -0500 |
| commit | c8293e29caf4701f130141a88b90709a09143d4e (patch) | |
| tree | fc84848355f3c5d21e3fd6dd1ba2c5eade2d8c03 /indra/llui/lllayoutstack.cpp | |
| parent | 94b0ce6d842a1f34bd46535a8b4db68aa397a541 (diff) | |
| parent | 76a325b83271424d231561d8ef099df1406c9517 (diff) | |
Automated merge up from viewer-development into mesh-development
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 |