diff options
| author | Richard Linden <none@none> | 2011-11-28 19:16:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-28 19:16:49 -0800 |
| commit | d089e6c26452a61fa3b33b71735bc39d90701865 (patch) | |
| tree | ab90eb0d34b116bd72a8041b7adf751e98a15a40 /indra/newview/llvovolume.h | |
| parent | f5159294f1c67503a1137f1fe31a41954643a7d7 (diff) | |
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index b6347526ee..22648ce46f 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -131,9 +131,11 @@ public: /*virtual*/ const LLMatrix4 getRenderMatrix() const; typedef std::map<LLUUID, S32> texture_cost_t; U32 getRenderCost(texture_cost_t &textures) const; - /*virtual*/ F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL, F32* unscaled_value = NULL) const; - /*virtual*/ U32 getTriangleCount() const; + F32 getStreamingCost(S32* bytes, S32* visible_bytes, F32* unscaled_value) const; + /*virtual*/ F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL) { return getStreamingCost(bytes, visible_bytes, NULL); } + + /*virtual*/ U32 getTriangleCount(); /*virtual*/ U32 getHighLODTriangleCount(); /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face = -1, // which face to check, -1 = ALL_SIDES |