diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-15 17:46:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-15 17:46:34 -0500 |
| commit | 0398e611f2cf3c4a6cecbee7b36250f7ca4348bf (patch) | |
| tree | 8795c07a4e4f8a2b656295d070ef9fdbda800d73 | |
| parent | 719e3f1483b3d74174e0d9d62cdd569a03555e66 (diff) | |
Fix for flycam not overriding focal point properly for DoF effect.
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index bde35ee33d..b946dbbd0f 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3746,7 +3746,11 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de LLVector3 mouse_world_start = mouse_point_global; LLVector3 mouse_world_end = mouse_point_global + mouse_direction_global * depth; - gDebugRaycastIntersection = mouse_world_end; + if (!LLViewerJoystick::getInstance()->getOverrideCamera()) + { //always set raycast intersection to mouse_world_end unless + //flycam is on (for DoF effect) + gDebugRaycastIntersection = mouse_world_end; + } if (start) { |