summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-06-28 08:58:10 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-06-28 08:58:10 -0400
commit57c230b73ea171d310ad3c132624a8fdd6751b0e (patch)
treed71f5f9350172bb841c7e3731df14032e4dcb276 /indra/llcommon
parentabb8a7018d0fc7a52aa35f4be1cec372719e4eda (diff)
CHOP-753: suppress VS fatal warning 4355
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llsys.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 92fdf4f327..156c78b1e8 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -24,6 +24,10 @@
* $/LicenseInfo$
*/
+#if LL_WINDOWS
+#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally
+#endif
+
#include "linden_common.h"
#include "llsys.h"