From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/llcommon/llstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/llstring.cpp')

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 59d71a8e8e..7a2d42dfaa 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -70,7 +70,7 @@ bool _read_file_into_string(std::string& str, const char* filename)
 	llifstream ifs(filename, llifstream::binary);
 	if (!ifs.is_open())
 	{
-		llinfos << "Unable to open file" << filename << llendl;
+		llinfos << "Unable to open file " << filename << llendl;
 		return false;
 	}
 
-- 
cgit v1.2.3