diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-09 19:39:24 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-09 19:39:24 +0300 |
| commit | f593911580383af653dd106ade60084a0eb64ebb (patch) | |
| tree | d0df16416eef0fa1c76eb924ec7525ff0d314261 /indra/newview/llfloatereditwater.cpp | |
| parent | e4d00671037e25bfe233bcd441140e113aeba64d (diff) | |
STORM-1254 WIP Fixing a Windows compilation error.
Diffstat (limited to 'indra/newview/llfloatereditwater.cpp')
| -rw-r--r-- | indra/newview/llfloatereditwater.cpp | 2 |
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) |