diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
| commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
| tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/newview/pipeline.cpp | |
| parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) | |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
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 74576492a2..4e679d28d5 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3165,7 +3165,7 @@ void LLPipeline::calcNearbyLights(LLCamera& camera) // begin() == the closest light and rbegin() == the farthest light const S32 MAX_LOCAL_LIGHTS = 6; // LLVector3 cam_pos = gAgent.getCameraPositionAgent(); - LLVector3 cam_pos = LLViewerJoystick::sOverrideCamera ? + LLVector3 cam_pos = LLViewerJoystick::getInstance()->getOverrideCamera() ? camera.getOrigin() : gAgent.getPositionAgent(); |