From e8b8a12b7365c17cf0326be365b78bcb1da1bfac Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 12 Mar 2013 10:48:05 -0700
Subject: Mods to make compile on gcc 4.6.3 work mo betta

---
 indra/llui/llkeywords.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index c1cd04186b..537cc82302 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -368,7 +368,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 	const llwchar* base = wtext.c_str();
 	const llwchar* cur = base;
 	const llwchar* line = NULL;
-
+        (void)line;
 	while( *cur )
 	{
 		if( *cur == '\n' || cur == base )
-- 
cgit v1.2.3


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/llkeywords.cpp | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 5f9dbb33ad..26d27d1f34 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -367,7 +367,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 
 	const llwchar* base = wtext.c_str();
 	const llwchar* cur = base;
-        (void)line;
 	while( *cur )
 	{
 		if( *cur == '\n' || cur == base )
-- 
cgit v1.2.3