From 443e38f94d3c8538b457304bbe17ed0ab04eeef2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 28 Apr 2011 19:13:15 -0700
Subject: fixed build (again)

---
 indra/llxuixml/llinitparam.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llxuixml')

diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 70dad4c8bf..a853999e94 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -1343,7 +1343,6 @@ namespace LLInitParam
 		{
 			mCurChoice = other.mCurChoice;
 			return BaseBlock::mergeBlock(selfBlockDescriptor(), other, overwrite);
-			return false;
 		}
 
 		// clear out old choice when param has changed
-- 
cgit v1.2.3