diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
| commit | 9e9d32de384b2807f195be48f49fbdec725f45d1 (patch) | |
| tree | 802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/newview/llviewerpartsim.cpp | |
| parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
| parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
| -rw-r--r-- | indra/newview/llviewerpartsim.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 6b3e04348a..345023dbfa 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -476,7 +476,7 @@ void LLViewerPartSim::checkParticleCount(U32 size) LLViewerPartSim::LLViewerPartSim() { LLMemType mt(LLMemType::MTYPE_PARTICLES); - sMaxParticleCount = gSavedSettings.getS32("RenderMaxPartCount"); + sMaxParticleCount = llmin(gSavedSettings.getS32("RenderMaxPartCount"), LL_MAX_PARTICLE_COUNT); static U32 id_seed = 0; mID = ++id_seed; } |