merge with release

2 files changed, 10 insertions, 10 deletions

diff --git a/indra/llmessage/tests/llareslistener_test.cpp b/indra/llmessage/tests/llareslistener_test.cpp
index 60c91e12cf..c04696c86b 100755
--- a/indra/llmessage/tests/llareslistener_test.cpp
+++ b/indra/llmessage/tests/llareslistener_test.cpp
@@ -135,7 +135,7 @@ namespace tut
     void object::test<2>()
     {
         set_test_name("bad op");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "foo";
         std::string threw;
@@ -143,7 +143,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -154,7 +154,7 @@ namespace tut
     void object::test<3>()
     {
         set_test_name("bad rewriteURI request");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "rewriteURI";
         std::string threw;
@@ -162,7 +162,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -175,7 +175,7 @@ namespace tut
     void object::test<4>()
     {
         set_test_name("bad rewriteURI request");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "rewriteURI";
         request["reply"] = "nonexistent";
@@ -184,7 +184,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -197,7 +197,7 @@ namespace tut
     void object::test<5>()
     {
         set_test_name("bad rewriteURI request");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "rewriteURI";
         request["uri"] = "foo.bar.com";
@@ -206,7 +206,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
diff --git a/indra/llmessage/tests/llmime_test.cpp b/indra/llmessage/tests/llmime_test.cpp
index aed5c4589c..ea48561ae9 100755
--- a/indra/llmessage/tests/llmime_test.cpp
+++ b/indra/llmessage/tests/llmime_test.cpp
@@ -83,8 +83,8 @@ namespace tut
 		headers["Content-Length"] = MULTI_CONTENT_LENGTH;
 		headers["Content-Type"] = MULTI_CONTENT_TYPE;
 		LLMimeIndex mime(headers, MULTI_CONTENT_OFFSET);
-		llinfos << "headers: " << LLSDOStreamer<LLSDNotationFormatter>(headers)
-			<< llendl;
+		LL_INFOS() << "headers: " << LLSDOStreamer<LLSDNotationFormatter>(headers)
+			<< LL_ENDL;
 
 
 		const S32 META_CONTENT_LENGTH = 700;