From 4942a7b77917f9a163453ecdd040993965672cc0 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Thu, 4 Oct 2007 16:31:48 +0000
Subject: Result of svn merge -r70873:71086
 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.

---
 indra/llmessage/message.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'indra/llmessage/message.cpp')

diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 5077354533..7f9f440c80 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -18,10 +18,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <cstring>
-#include <time.h>
 #include <iomanip>
 #include <iterator>
 #include <sstream>
@@ -355,8 +351,8 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
 		return;
 	}
 
-	LLString template_body;
-	if(!LLString::read(template_body, filename))
+	std::string template_body;
+	if(!_read_file_into_string(template_body, filename))
 	{
 		llwarns << "Failed to open template: " << filename << llendl;
 		mbError = TRUE;
-- 
cgit v1.3