diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-08 17:40:16 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-08 17:40:16 -0500 |
commit | f2af75d93af24d2cba311d2f083c19d42e94df3d (patch) | |
tree | 6b0b610996a3eec3a7d3130843379d6d87c92a6e /indra/newview | |
parent | ebf0dd4dce6d2c3f9f7415f548bca3da217821f8 (diff) | |
parent | 44119c512f7eca7caa7a521090914624c502a9b1 (diff) |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/pipeline.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index ca58d8275b..69173d26f4 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1021,7 +1021,6 @@ S32 LLPipeline::getMaxLightingDetail() const S32 LLPipeline::setLightingDetail(S32 level) { LLMemType mt_ld(LLMemType::MTYPE_PIPELINE_LIGHTING_DETAIL); - assertInitialized(); if (level < 0) { |