From fd1a688f463703ec78a399b35fed19b3d907c91b Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 10 Oct 2011 19:21:01 -0700
Subject: fixed bad merge

---
 indra/llui/lltoolbar.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index ca04a0e5d5..321064a0fd 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -47,8 +47,8 @@ class LLToolBarButton : public LLButton
 public:
 	struct Params : public LLInitParam::Block<Params, LLButton::Params>
 	{
-		Optional<LLUI::RangeS32>	button_width;
-		Optional<S32>				desired_height;
+		Optional<LLUI::RangeS32::Params>	button_width;
+		Optional<S32>						desired_height;
 
 		Params()
 		:	button_width("button_width"),
-- 
cgit v1.2.3