Skip to content
Snippets Groups Projects
Commit f55f974b authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Warning fixes

parent 1288d593
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,7 @@ class LLVOGrass final : public LLAlphaObject ...@@ -43,7 +43,7 @@ class LLVOGrass final : public LLAlphaObject
static void initClass(); static void initClass();
static void cleanupClass(); static void cleanupClass();
virtual U32 getPartitionType() const; U32 getPartitionType() const override;
/*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys, /*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys,
void **user_data, void **user_data,
...@@ -65,7 +65,7 @@ class LLVOGrass final : public LLAlphaObject ...@@ -65,7 +65,7 @@ class LLVOGrass final : public LLAlphaObject
LLStrider<LLColor4U>& emissivep, LLStrider<LLColor4U>& emissivep,
LLStrider<U16>& indicesp); LLStrider<U16>& indicesp);
void updateFaceSize(S32 idx) { } void updateFaceSize(S32 idx) override { }
/*virtual*/ void updateTextures(); /*virtual*/ void updateTextures();
/*virtual*/ BOOL updateLOD(); /*virtual*/ BOOL updateLOD();
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
......
...@@ -53,13 +53,13 @@ class LLVOSurfacePatch final : public LLStaticViewerObject ...@@ -53,13 +53,13 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
/*virtual*/ void markDead() override; /*virtual*/ void markDead() override;
virtual U32 getPartitionType() const; virtual U32 getPartitionType() const override;
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline) override; /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline) override;
/*virtual*/ void updateGL() override; /*virtual*/ void updateGL() override;
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override; /*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override;
/*virtual*/ BOOL updateLOD() override; /*virtual*/ BOOL updateLOD() override;
/*virtual*/ void updateFaceSize(S32 idx); /*virtual*/ void updateFaceSize(S32 idx) override;
void getGeometry(LLStrider<LLVector3> &verticesp, void getGeometry(LLStrider<LLVector3> &verticesp,
LLStrider<LLVector3> &normalsp, LLStrider<LLVector3> &normalsp,
LLStrider<LLVector2> &texCoords0p, LLStrider<LLVector2> &texCoords0p,
......
...@@ -89,7 +89,7 @@ class LLVOVoidWater final : public LLVOWater ...@@ -89,7 +89,7 @@ class LLVOVoidWater final : public LLVOWater
mRenderType = LLPipeline::RENDER_TYPE_VOIDWATER; mRenderType = LLPipeline::RENDER_TYPE_VOIDWATER;
} }
/*virtual*/ U32 getPartitionType() const; /*virtual*/ U32 getPartitionType() const override;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment