From 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Wed, 11 Jul 2007 21:29:02 +0000 Subject: svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw. --- indra/llcommon/llstring.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/llcommon/llstring.h') diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 3c798b25aa..c958e08415 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -1054,9 +1054,6 @@ BOOL LLStringBase::isHead( const std::basic_string& string, const T* s ) template BOOL LLStringBase::read(std::basic_string& string, const char* filename) /*Flawfinder: ignore*/ { -#ifdef LL_LINUX - printf("STUBBED: LLStringBase::read at %s:%d\n", __FILE__, __LINE__); -#else llifstream ifs(filename, llifstream::binary); if (!ifs.is_open()) { @@ -1071,7 +1068,6 @@ BOOL LLStringBase::read(std::basic_string& string, const char* filename) string = oss.str(); ifs.close(); -#endif return TRUE; } -- cgit v1.3