From 60c2a946c2d1d760ce02edad62697d9d0efbfb79 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 11:17:31 -0700
Subject: Fixed an issue with llkeywords.cpp(385) and Visual Studio

---
 linden/indra/llui/llkeywords.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index b7e7d87..3580567 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -380,9 +380,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 					seg_start = cur - base;
 					cur += cur_delimiter->getLength();
 					
-					if( cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER || LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
+					LLKeywordToken::TOKEN_TYPE type = cur_delimiter->getType();
+					if (type == LLKeywordToken::TWO_SIDED_DELIMITER || type == LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
 					{
-						llassert( cur_delimiter->getDelimiter() != NULL );
 						while( *cur && !cur_delimiter->isTail(cur))
 						{
 							// Check for an escape sequence.
-- 
cgit v1.1