diff options
| author | Richard Linden <none@none> | 2012-07-30 15:16:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-30 15:16:15 -0700 |
| commit | de4b362839adbac123010b294e5c52fad90965b3 (patch) | |
| tree | a0d93ce497784ab744412a8eb76f74223163de71 /indra/newview/pipeline.cpp | |
| parent | 9fa3407c9c18e0e9592bd659a515ec0b77ba13bd (diff) | |
| parent | f29bdc27b3038a19317095ef914bd560f3199d28 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7c744f3c3f..9268e5a869 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -5318,7 +5318,7 @@ void LLPipeline::calcNearbyLights(LLCamera& camera) // crazy cast so that we can overwrite the fade value // even though gcc enforces sets as const // (fade value doesn't affect sort so this is safe) - Light* farthest_light = ((Light*) (&(*(mNearbyLights.rbegin())))); + Light* farthest_light = (const_cast<Light*>(&(*(mNearbyLights.rbegin())))); if (light->dist < farthest_light->dist) { if (farthest_light->fade >= 0.f) |