From f593911580383af653dd106ade60084a0eb64ebb Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 9 Jun 2011 19:39:24 +0300
Subject: STORM-1254 WIP Fixing a Windows compilation error.

---
 indra/newview/llfloatereditwater.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

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)
-- 
cgit v1.2.3