diff options
| author | simon <none@none> | 2013-04-12 09:26:59 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-12 09:26:59 -0700 |
| commit | cd8cd8c265abb0c568ee7b925551023c8081c298 (patch) | |
| tree | 6ff5a8eb20e17852e997777ea79f8314409b602d /indra/llui/lllayoutstack.cpp | |
| parent | e2836d99d8d1295c123a67bdc572ab9a36b6389f (diff) | |
Fix merge oddities
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 7115ad496a..dff98f33b9 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -476,7 +476,6 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp) if (lp->mResizeBar == NULL) { LLResizeBar::Side side = (mOrientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM; - (void)resize_bar_rect; LLResizeBar::Params resize_params; resize_params.name("resize"); resize_params.resizing_view(lp); |