diff options
author | Jacek Antonelli | 2008-12-09 22:25:37 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-09 22:25:41 -0600 |
commit | 22b861982f2efd5d16097a012627e73b9fb85834 (patch) | |
tree | 6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/newview/llviewerwindow.cpp | |
parent | Second Life viewer sources 1.22.1-RC (diff) | |
download | meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.zip meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.gz meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.bz2 meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.xz |
Second Life viewer sources 1.22.2-RC
Diffstat (limited to 'linden/indra/newview/llviewerwindow.cpp')
-rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 106ad08..109b3c2 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
@@ -29,13 +29,13 @@ | |||
29 | * $/LicenseInfo$ | 29 | * $/LicenseInfo$ |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "llviewerprecompiledheaders.h" | ||
33 | |||
32 | // system library includes | 34 | // system library includes |
33 | #include <stdio.h> | 35 | #include <stdio.h> |
34 | #include <iostream> | 36 | #include <iostream> |
35 | #include <fstream> | 37 | #include <fstream> |
36 | 38 | ||
37 | #include "llviewerprecompiledheaders.h" | ||
38 | |||
39 | #include "llpanellogin.h" | 39 | #include "llpanellogin.h" |
40 | #include "llviewerkeyboard.h" | 40 | #include "llviewerkeyboard.h" |
41 | #include "llviewerwindow.h" | 41 | #include "llviewerwindow.h" |
@@ -3560,7 +3560,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de | |||
3560 | LLVector3 mouse_hud_end = mouse_point_hud + LLVector3(depth, 0, 0); | 3560 | LLVector3 mouse_hud_end = mouse_point_hud + LLVector3(depth, 0, 0); |
3561 | 3561 | ||
3562 | // world coordinates of mouse | 3562 | // world coordinates of mouse |
3563 | LLVector3 mouse_direction_global = mouseDirectionGlobal(x,y); | 3563 | LLVector3 mouse_direction_global = mouseDirectionGlobal(x,y); |
3564 | LLVector3 mouse_point_global = LLViewerCamera::getInstance()->getOrigin(); | 3564 | LLVector3 mouse_point_global = LLViewerCamera::getInstance()->getOrigin(); |
3565 | LLVector3 mouse_world_start = mouse_point_global; | 3565 | LLVector3 mouse_world_start = mouse_point_global; |
3566 | LLVector3 mouse_world_end = mouse_point_global + mouse_direction_global * depth; | 3566 | LLVector3 mouse_world_end = mouse_point_global + mouse_direction_global * depth; |
@@ -5202,7 +5202,7 @@ void LLPickInfo::fetchResults() | |||
5202 | LLVector3 intersection, normal, binormal; | 5202 | LLVector3 intersection, normal, binormal; |
5203 | LLVector2 uv; | 5203 | LLVector2 uv; |
5204 | 5204 | ||
5205 | LLViewerObject* hit_object = gViewerWindow->cursorIntersect(-1, -1, 512.f, | 5205 | LLViewerObject* hit_object = gViewerWindow->cursorIntersect(mMousePt.mX, mMousePt.mY, 512.f, |
5206 | NULL, -1, mPickTransparent, &face_hit, | 5206 | NULL, -1, mPickTransparent, &face_hit, |
5207 | &intersection, &uv, &normal, &binormal); | 5207 | &intersection, &uv, &normal, &binormal); |
5208 | 5208 | ||