diff options
| author | Tofu Buzzard <no-email> | 2011-03-08 15:53:39 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-08 15:53:39 -0800 |
| commit | ceb8561e49ace81d39209849a6f8a805d2d9d8ed (patch) | |
| tree | 5260f3a7e6dc889ebbc26569df8fdf23db6f5c95 /indra/newview/pipeline.cpp | |
| parent | fffcb116fefd6501f629f13457be90a4d88e746b (diff) | |
| parent | 94b0ce6d842a1f34bd46535a8b4db68aa397a541 (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6af371072b..c8ef75030d 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6202,6 +6202,12 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) { focus_point = gDebugRaycastIntersection; } + else if (gAgentCamera.cameraMouselook()) + { + gViewerWindow->cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE, + NULL, + &focus_point); + } else { LLViewerObject* obj = gAgentCamera.getFocusObject();
@@ -6209,6 +6215,10 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) {
focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal());
} + else + { + focus_point = gDebugRaycastIntersection; + } } } |
