diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-23 23:31:25 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-23 23:31:25 -0800 |
| commit | 0b4c2fa99e50129a6ef5ac6a3d0337ee2b1b1e97 (patch) | |
| tree | 32d3f3d1dea4609d53742d77fe3e9b3c72ffbd5c | |
| parent | 2b979742f6b28e615b2b36e10257c78711e537c3 (diff) | |
Fix windows build break
| -rw-r--r-- | indra/llmath/llcamera.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llcamera.h | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp index a30a50ab2e..c681e00b32 100644 --- a/indra/llmath/llcamera.cpp +++ b/indra/llmath/llcamera.cpp @@ -85,7 +85,7 @@ F32 LLCamera::getMaxView() const // ---------------- LLCamera::setFoo() member functions ---------------- -void LLCamera::setUserClipPlane(LLPlane plane) +void LLCamera::setUserClipPlane(LLPlane& plane) { mPlaneCount = 7; mAgentPlanes[6] = plane; diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h index a346322e0e..82d80f1057 100644 --- a/indra/llmath/llcamera.h +++ b/indra/llmath/llcamera.h @@ -147,7 +147,7 @@ public: virtual ~LLCamera(); - void setUserClipPlane(LLPlane plane); + void setUserClipPlane(LLPlane& plane); void disableUserClipPlane(); virtual void setView(F32 vertical_fov_rads); void setViewHeightInPixels(S32 height); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 9685028639..f96aefeffe 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7859,7 +7859,8 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) gPipeline.popRenderTypeMask(); LLDrawPoolWater::sNeedsReflectionUpdate = FALSE; LLDrawPoolWater::sNeedsDistortionUpdate = FALSE; - LLViewerCamera::getInstance()->setUserClipPlane(LLPlane(-pnorm, -pd)); + LLPlane npnorm(-pnorm, -pd); + LLViewerCamera::getInstance()->setUserClipPlane(npnorm); LLPipeline::sUseOcclusion = occlusion; LLGLState::checkStates(); |