From a0a1d93fb6a74149bbef57f1d1489510247110ca Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 15 Nov 2018 09:49:36 -0800
Subject: Merge 6ish

---
 indra/newview/lldrawpoolwater.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/lldrawpoolwater.cpp')

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index df06ad31e6..9316890156 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -48,6 +48,10 @@
 #include "llviewershadermgr.h"
 #include "llwaterparammanager.h"
 
+#if LL_WINDOWS
+#pragma optimize("", off)
+#endif
+
 const LLUUID TRANSPARENT_WATER_TEXTURE("2bfd3884-7e27-69b9-ba3a-3e673f680004");
 const LLUUID OPAQUE_WATER_TEXTURE("43c32285-d658-1793-c123-bf86315de055");
 
-- 
cgit v1.3