Second Life viewer sources 1.19.1.0

1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llvosurfacepatch.h b/linden/indra/newview/llvosurfacepatch.h
index 024ccfd..52c11c9 100644
--- a/linden/indra/newview/llvosurfacepatch.h
+++ b/linden/indra/newview/llvosurfacepatch.h
@@ -42,6 +42,8 @@ class LLVector2;
 class LLVOSurfacePatch : public LLStaticViewerObject
 {
 public:
+        static F32 sLODFactor;
+
         enum
         {
                 VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
@@ -69,7 +71,7 @@ public:
                                                                 LLStrider<LLColor4U> &colorsp,
                                                                 LLStrider<LLVector2> &texCoords0p,
                                                                 LLStrider<LLVector2> &texCoords1p,
-                                                                LLStrider<U32> &indicesp);
+                                                                LLStrider<U16> &indicesp);
 
         /*virtual*/ void updateTextures(LLAgent &agent);
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
@@ -99,8 +101,6 @@ protected:
         S32                             mLastStride;
         S32                             mLastLength;
 
-        void calcColor(const LLVector3* vertex, const LLVector3* normal, LLColor4U* colorp);
-        BOOL updateShadows(BOOL use_shadow_factor = FALSE);
         void getGeomSizesMain(const S32 stride, S32 &num_vertices, S32 &num_indices);
         void getGeomSizesNorth(const S32 stride, const S32 north_stride,
                                                                   S32 &num_vertices, S32 &num_indices);
@@ -113,7 +113,7 @@ protected:
                                            LLStrider<LLColor4U> &colorsp,
                                            LLStrider<LLVector2> &texCoords0p,
                                            LLStrider<LLVector2> &texCoords1p,
-                                           LLStrider<U32> &indicesp,
+                                           LLStrider<U16> &indicesp,
                                            U32 &index_offset);
         void updateNorthGeometry(LLFace *facep,
                                            LLStrider<LLVector3> &verticesp,
@@ -121,7 +121,7 @@ protected:
                                            LLStrider<LLColor4U> &colorsp,
                                            LLStrider<LLVector2> &texCoords0p,
                                            LLStrider<LLVector2> &texCoords1p,
-                                           LLStrider<U32> &indicesp,
+                                           LLStrider<U16> &indicesp,
                                            U32 &index_offset);
         void updateEastGeometry(LLFace *facep,
                                            LLStrider<LLVector3> &verticesp,
@@ -129,7 +129,7 @@ protected:
                                            LLStrider<LLColor4U> &colorsp,
                                            LLStrider<LLVector2> &texCoords0p,
                                            LLStrider<LLVector2> &texCoords1p,
-                                           LLStrider<U32> &indicesp,
+                                           LLStrider<U16> &indicesp,
                                            U32 &index_offset);
 };