summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloatereditwater.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp
index d8ddfb5b1b..a5d392afc6 100644
--- a/indra/newview/llfloatereditwater.cpp
+++ b/indra/newview/llfloatereditwater.cpp
@@ -44,6 +44,8 @@
#include "llviewerregion.h"
#include "llwaterparammanager.h"
+#undef max // Fixes a Windows compiler error
+
LLFloaterEditWater::LLFloaterEditWater(const LLSD &key)
: LLFloater(key)
, mWaterPresetNameEditor(NULL)