diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-16 10:34:16 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-16 10:34:16 -0700 |
commit | cb1b361b49c9ae6a76eaeeb4476a341a024a71f1 (patch) | |
tree | b745e710f7432901b9234e90569d53fa4b8bf218 /indra | |
parent | ac91bc0115d0f8d34f03819e25bb278f559e9f28 (diff) |
FIX windows build: no automatic conversoin between LLVector3 and LLVector3d??
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llviewermediafocus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index d5e3e6019c..c77533ba5a 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -51,12 +51,12 @@ public: ~LLViewerMediaFocus(); // Set/clear the face that has media focus (takes keyboard input and has the full set of controls) - void setFocusFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3d::zero); + void setFocusFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero); void clearFocus(); // Set/clear the face that has "media hover" (has the mimimal set of controls to zoom in or pop out into a media browser). // If a media face has focus, the media hover will be ignored. - void setHoverFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3d::zero); + void setHoverFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero); void clearHover(); /*virtual*/ bool getFocus(); |