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/llmath/v3color.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llmath/v3color.h')

diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h
index 56820148d5..e2a8274839 100644
--- a/indra/llmath/v3color.h
+++ b/indra/llmath/v3color.h
@@ -174,6 +174,10 @@ inline LLColor3::LLColor3(const F32 *vec)
 	mV[VZ] = vec[VZ];
 }
 
+#if LL_WINDOWS
+# pragma warning( disable : 4996 ) // strncpy teh sux0r
+#endif
+
 inline LLColor3::LLColor3(char* color_string) // takes a string of format "RRGGBB" where RR is hex 00..FF 
 {
 	if (strlen(color_string) <  6)		/* Flawfinder: ignore */
-- 
cgit v1.2.3