diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-05 17:35:52 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-05 17:35:52 -0800 |
| commit | e654475529d924603a9b3bc8c4775c86d3cf7933 (patch) | |
| tree | 2c085c2beeced9f2be8ac1510b093002d2968793 | |
| parent | 6970ffa5aac2670bc25f57d42df4aad79c2866fa (diff) | |
| parent | e948c0c03c5d6a9d3b81617a88927bbc2058e28d (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
| -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 8621e5e1d9..7a7538ae62 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 gSavedSettings.getU32("WLSkyDetail"); + return min(MAX_SKY_DETAIL, max(MIN_SKY_DETAIL, gSavedSettings.getU32("WLSkyDetail"))); } inline U32 LLVOWLSky::getNumSlices(void) { - return 2 * gSavedSettings.getU32("WLSkyDetail"); + return 2 * min(MAX_SKY_DETAIL, max(MIN_SKY_DETAIL, gSavedSettings.getU32("WLSkyDetail"))); } inline U32 LLVOWLSky::getFanNumVerts(void) |