From b82c94383bab5cba8661e64ee684f41493dd7624 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 24 May 2011 18:56:53 +0200 Subject: [PATCH] Make V2Renderer branch compile. --- indra/llmath/llcamera.cpp | 2 +- indra/llmath/llcamera.h | 2 +- indra/llmath/llplane.h | 2 +- indra/newview/pipeline.cpp | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp index da71cae9d..263803930 100644 --- a/indra/llmath/llcamera.cpp +++ b/indra/llmath/llcamera.cpp @@ -92,7 +92,7 @@ F32 LLCamera::getMaxView() const // ---------------- LLCamera::setFoo() member functions ---------------- -void LLCamera::setUserClipPlane(LLPlane& plane) +void LLCamera::setUserClipPlane(LLPlane const& plane) { mPlaneCount = 7; mAgentPlanes[6] = plane; diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h index 38555b1e7..56afca025 100644 --- a/indra/llmath/llcamera.h +++ b/indra/llmath/llcamera.h @@ -143,7 +143,7 @@ public: virtual ~LLCamera(); - void setUserClipPlane(LLPlane& plane); + void setUserClipPlane(LLPlane const& plane); void disableUserClipPlane(); virtual void setView(F32 vertical_fov_rads); void setViewHeightInPixels(S32 height); diff --git a/indra/llmath/llplane.h b/indra/llmath/llplane.h index ebfe77a9c..8803d0774 100644 --- a/indra/llmath/llplane.h +++ b/indra/llmath/llplane.h @@ -78,7 +78,7 @@ public: inline void getVector3(LLVector3& vec) const { vec.set(mV[0], mV[1], mV[2]); } // Retrieve the mask indicating which of the x, y, or z axis are greater or equal to zero. - inline U8 calcPlaneMask() + inline U8 calcPlaneMask() const { U8 mask = 0; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 827afec95..808807494 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8612,7 +8612,6 @@ void LLPipeline::generateSunShadow(LLCamera& camera) //hack to disable projector shadows - static bool clear = true; static const LLCachedControl gen_shadow("RenderShadowDetail",0); if (gen_shadow > 1)