summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-06-17 15:13:48 +0000
committerNat Goodspeed <nat@lindenlab.com>2009-06-17 15:13:48 +0000
commitad40d64b0e421a6ab9546f1c721117a3bff754cb (patch)
tree1e3bb0e39d3f9f997f093fafd8781ac3ad58ff0d
parent050d2db0f805d799c59349253262b648aa8f70b2 (diff)
DEV-32777: tip won't even build on Windows without pacifying MSVC warning
-rw-r--r--indra/viewer_components/login/tests/lllogin_test.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
index b9fe59c0a6..e43065d49f 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -9,6 +9,10 @@
* $/LicenseInfo$
*/
+#if LL_WINDOWS
+#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally
+#endif
+
// Precompiled header
#include "linden_common.h"
// associated header