diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-19 12:37:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-19 12:37:27 -0500 |
| commit | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (patch) | |
| tree | b4053044a9d9f95aa7fea445ce8873ae744f74b1 /indra/newview/llviewerwindow.cpp | |
| parent | 3cb97cb4d75c40d9519d796dd52d0741d354fc97 (diff) | |
| parent | c494e5c0d55b2da2f5aa5ea18fbccb670b2f3107 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -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 8e4e6b5b07..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) { |