From 00dbacb215da8d6b6739b4bcefebee552de89a9c Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 14 Mar 2007 23:03:50 +0000
Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161
 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 -->
 release

---
 indra/llinventory/llnotecard.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/llinventory/llnotecard.cpp')

diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp
index 79545874b4..96ee7ff800 100644
--- a/indra/llinventory/llnotecard.cpp
+++ b/indra/llinventory/llnotecard.cpp
@@ -7,11 +7,10 @@
  */
 
 #include "linden_common.h"
-#include "llinventory.h"
 #include "llnotecard.h"
 #include "llstreamtools.h"
 
-LLNotecard::LLNotecard(U32 max_text)
+LLNotecard::LLNotecard(S32 max_text)
 : mMaxText(max_text)
 {
 }
@@ -179,7 +178,7 @@ bool LLNotecard::importStream(std::istream& str)
 	}
 	line_buf[STD_STRING_STR_LEN] = '\0';
 	
-	U32 text_len = 0;
+	S32 text_len = 0;
 	if( 1 != sscanf(line_buf, "Text length %d", &text_len) )
 	{
 		llwarns << "Invalid Linden text length field" << llendl;
-- 
cgit v1.2.3