From cd8cd8c265abb0c568ee7b925551023c8081c298 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 12 Apr 2013 09:26:59 -0700
Subject: Fix merge oddities

---
 indra/llui/lllayoutstack.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llui/lllayoutstack.cpp')

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);
-- 
cgit v1.2.3