diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
| commit | ba1fbddc2dbc526ee89e7d79b35cf3e0a46e3add (patch) | |
| tree | d779020d73e73a8eb9fa8731c362b8708c8837ef /indra/newview/lldrawpoolwater.cpp | |
| parent | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (diff) | |
| parent | a0a1d93fb6a74149bbef57f1d1489510247110ca (diff) | |
Merge 6ish
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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"); |