From cc31b4ae7934010762b8aaaa7e190c74a1cd7820 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 12 Aug 2013 20:05:16 -0700
Subject: SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture
 queue bounces once per second SH-4346 FIX: Interesting: some integer
 Statistics are displayed as floating point after crossing region boundary
 made llerrs/infos/etc properly variadic wrt tags LL_INFOS("A", "B", "C")
 works, for example fixed unit tests remove llsimplestat

---
 indra/llcommon/tests/llsdserialize_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llsdserialize_test.cpp')

diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 4d436e8897..235008a5ae 100755
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -268,7 +268,7 @@ namespace tut
 	{
 		std::stringstream stream;	
 		mFormatter->format(v, stream);
-		//llinfos << "checkRoundTrip: length " << stream.str().length() << llendl;
+		//LL_INFOS() << "checkRoundTrip: length " << stream.str().length() << LL_ENDL;
 		LLSD w;
 		mParser->reset();	// reset() call is needed since test code re-uses mParser
 		mParser->parse(stream, w, stream.str().size());
-- 
cgit v1.2.3


From b1419bfbf090afa8b57d0952d98a529527c82f2d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 22 Aug 2013 16:56:14 -0700
Subject: BUILDFIX: attempted fix for crash on exit in llsdserialize test

---
 indra/llcommon/tests/llsdserialize_test.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llcommon/tests/llsdserialize_test.cpp')

diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 235008a5ae..ad89380e36 100755
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1723,5 +1723,8 @@ namespace tut
                       "This string\n"
                       "has several\n"
                       "lines.");
+        
+        bool loop = true;
+        while(loop) {}
     }
 }
-- 
cgit v1.2.3


From 3413a57a90094b1844fbc837d5ce24921c87e600 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 22 Aug 2013 16:57:51 -0700
Subject: BUILDFIX: accidental checkin of infinite loop in llsdserialize test

---
 indra/llcommon/tests/llsdserialize_test.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/llcommon/tests/llsdserialize_test.cpp')

diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index ad89380e36..235008a5ae 100755
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1723,8 +1723,5 @@ namespace tut
                       "This string\n"
                       "has several\n"
                       "lines.");
-        
-        bool loop = true;
-        while(loop) {}
     }
 }
-- 
cgit v1.2.3


From a77f42494584537489410a5157179aaadf868935 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 23 Aug 2013 13:41:51 -0700
Subject: BUILDFIX: fix for crashes in unit tests on mac and linux

---
 indra/llcommon/tests/llsdserialize_test.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/llcommon/tests/llsdserialize_test.cpp')

diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 235008a5ae..b5893135ea 100755
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -56,12 +56,9 @@ namespace lambda = boost::lambda;
 #include "../llformat.h"
 
 #include "../test/lltut.h"
-#include "../test/manageapr.h"
 #include "../test/namedtempfile.h"
 #include "stringize.h"
 
-static ManageAPR manager;
-
 std::vector<U8> string_to_vector(const std::string& str)
 {
 	return std::vector<U8>(str.begin(), str.end());
@@ -1723,5 +1720,6 @@ namespace tut
                       "This string\n"
                       "has several\n"
                       "lines.");
+        
     }
 }
-- 
cgit v1.2.3