diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-06 12:06:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-06 12:06:35 +0000 |
| commit | 56281befc1815fb26c25c75b8bf9f0295f43e319 (patch) | |
| tree | a039b689573b740d2633d3bff48d8584c8224260 | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
fix the Ext-2191 linux compile failure
min->llmin, max->llmax
| -rw-r--r-- | indra/newview/llvowlsky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp index 7a7538ae62..d3238f16a8 100644 --- a/indra/newview/llvowlsky.cpp +++ b/indra/newview/llvowlsky.cpp @@ -49,12 +49,12 @@ const U32 LLVOWLSky::MAX_SKY_DETAIL = 180; inline U32 LLVOWLSky::getNumStacks(void) { - return min(MAX_SKY_DETAIL, max(MIN_SKY_DETAIL, gSavedSettings.getU32("WLSkyDetail"))); + return llmin(MAX_SKY_DETAIL, llmax(MIN_SKY_DETAIL, gSavedSettings.getU32("WLSkyDetail"))); } inline U32 LLVOWLSky::getNumSlices(void) { - return 2 * min(MAX_SKY_DETAIL, max(MIN_SKY_DETAIL, gSavedSettings.getU32("WLSkyDetail"))); + return 2 * llmin(MAX_SKY_DETAIL, llmax(MIN_SKY_DETAIL, gSavedSettings.getU32("WLSkyDetail"))); } inline U32 LLVOWLSky::getFanNumVerts(void) |