diff options
| author | Richard Linden <none@none> | 2013-04-11 19:18:55 -0700 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-11 19:18:55 -0700 | 
| commit | 1459a412b9c9776daa7e6f3b5be35fe67970b3c5 (patch) | |
| tree | 7f25dd68f3d8408f6f1b37b2f9ad9d0613679daf /indra/newview/pipeline.cpp | |
| parent | c05fa390dc57b072da4b69b4e08743fd62bf4ce5 (diff) | |
| parent | 2436bd9487ac62899ed01859bdd4c0871020d4f7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
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 26ceaf512a..1b5148e560 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -9816,7 +9816,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)  	{  		LLTrace::CountStatHandle<>* velocity_stat = LLViewerCamera::getVelocityStat();  		F32 fade_amt = gFrameIntervalSeconds.value()  -			* llmax(LLTrace::get_frame_recording().getLastRecordingPeriod().getSum(*velocity_stat) / LLTrace::get_frame_recording().getLastRecordingPeriod().getDuration().value(), 1.0); +			* llmax(LLTrace::get_frame_recording().getLastRecording().getSum(*velocity_stat) / LLTrace::get_frame_recording().getLastRecording().getDuration().value(), 1.0);  		//update shadow targets  		for (U32 i = 0; i < 2; i++)  | 
