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/llerror.cpp                  | 3 ++-
 indra/llcommon/tests/llsdserialize_test.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 1b1aada8c1..590e236090 100755
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -928,7 +928,8 @@ namespace
 
 			if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s.mPrintLocation))
 			{
-				message_stream << site.mLocationString << " ";
+				message_stream << site.mLocationString;
+                message_stream << " ";
 			}
 
 			if (show_time && r->wantsTime() && s.mTimeFunction != NULL)
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