From 38558960978a0741dd9c79c4c7a108b8a1f99eff Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Mon, 19 May 2008 17:02:33 +0000 Subject: EFFECTIVE MERGES: svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated --- indra/llmath/llcamera.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llmath/llcamera.h') diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h index bd894753f8..82c712e5e7 100644 --- a/indra/llmath/llcamera.h +++ b/indra/llmath/llcamera.h @@ -115,11 +115,12 @@ protected: LLPlane mWorldPlanes[PLANE_NUM]; LLPlane mHorizPlanes[HORIZ_PLANE_NUM]; - typedef struct + struct frustum_plane { + frustum_plane() : mask(0) {} LLPlane p; U8 mask; - } frustum_plane; + }; frustum_plane mAgentPlanes[7]; //frustum planes in agent space a la gluUnproject (I'm a bastard, I know) - DaveP U32 mPlaneCount; //defaults to 6, if setUserClipPlane is called, uses user supplied clip plane in -- cgit v1.2.3