diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-03 19:45:47 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-03 19:45:47 -0500 |
| commit | 9f361b47ffaf884f996b213d90fb57f535514744 (patch) | |
| tree | 935ae234d0909fb33d5ba8ee300a418712d12dda /indra/newview/llvovolume.h | |
| parent | 957b8b15e1dc799c6f9b1c8dd42903f4c3f911f8 (diff) | |
| parent | fbfecd49c7f8f6dafc36cf56c0331a1207765f22 (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 5af88c6cbd..e02a5d5675 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -132,7 +132,7 @@ public: typedef std::map<LLUUID, S32> texture_cost_t; U32 getRenderCost(texture_cost_t &textures) const; /*virtual*/ F32 getStreamingCost(); - /*virtual*/ U32 getTriangleCount(); + /*virtual*/ U32 getTriangleCount() const; /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face = -1, // which face to check, -1 = ALL_SIDES BOOL pick_transparent = FALSE, |