diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-01 17:36:46 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-01 17:36:46 -0700 |
| commit | 1d6957ce09f92df6c0766162de1a84547f40e3bd (patch) | |
| tree | 34b15b0722b838702d1185b96b239a46a7fcc7c9 /indra/newview/pipeline.cpp | |
| parent | c6d981a8430f02a5a78afbeece9afeb7b2f108c8 (diff) | |
| parent | 898ec6cd362cd92ceef8dca8faf3fb8ed119b1be (diff) | |
merge of latest changes
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) |