Merge branch 'master' into DRTVWR-513-maint

# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp

1 files changed, 0 insertions, 16 deletions

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 0174c411b4..0290eea143 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -657,22 +657,6 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
 }
 
 #if LL_WINDOWS
-// documentation moved to header. Phoenix 2007-11-27
-namespace snprintf_hack
-{
-	int snprintf(char *str, size_t size, const char *format, ...)
-	{
-		va_list args;
-		va_start(args, format);
-
-		int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */
-		va_end(args);
-		
-		str[size-1] = '\0'; // always null terminate
-		return num_written;
-	}
-}
-
 std::string ll_convert_wide_to_string(const wchar_t* in)
 {
 	return ll_convert_wide_to_string(in, CP_UTF8);