Second Life viewer sources 1.14.0.0

1 files changed, 13 insertions, 3 deletions

diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 50d5460..023db03 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -36,7 +36,7 @@ class LLSurfacePatch;
 class LLViewerImage;
 
 
-class LLVOGrass : public LLViewerObject
+class LLVOGrass : public LLAlphaObject
 {
 public:
         LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
@@ -46,6 +46,8 @@ public:
         static void initClass();
         static void cleanupClass();
 
+        virtual U32 getPartitionType() const;
+
         /*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys,
                                                                                         void **user_data,
                                                                                         U32 block_num, 
@@ -53,11 +55,19 @@ public:
                                                                                         LLDataPacker *dp);
         static void import(FILE *file, LLMessageSystem *mesgsys, const LLVector3 &pos);
         /*virtual*/ void exportFile(FILE *file, const LLVector3 &position);
-        
+
+        void updateDrawable(BOOL force_damped);
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL                updateGeometry(LLDrawable *drawable);
-
+        /*virtual*/ void                getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp);
+
+        void updateFaceSize(S32 idx) { }
         /*virtual*/ void updateTextures(LLAgent &agent);                                                                                        
         /*virtual*/ BOOL updateLOD();
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area