diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llmessage/message.cpp | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llmessage/message.cpp')
| -rw-r--r-- | indra/llmessage/message.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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; |