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 --- ChangeLog.txt | 6 ++++++ linden/indra/llui/llkeywords.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ad75137..089eff2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,8 +1,14 @@ 2009-10-03 McCabe Maxsted + * Fixed an issue with llkeywords.cpp(385) and Visual Studio. + + modified: linden/indra/llui/llkeywords.cpp + + * Fixed search window height being too small for new profile layout. modified: linden/indra/newview/skins/default/xui/en-us/floater_directory.xml + 2009-10-02 McCabe Maxsted 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* 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