diff options
| author | leyla_linden <none@none> | 2011-02-08 15:01:02 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-08 15:01:02 -0800 |
| commit | b30bf98531b86a422a3b2f6098b351513d15a600 (patch) | |
| tree | 6bf9a23cfa0340375c567b8b34f24996224597c7 /indra/newview/llvovolume.h | |
| parent | 9cd092544f6f4183af19132ed68111bd8d31a89f (diff) | |
| parent | f2af75d93af24d2cba311d2f083c19d42e94df3d (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 5af88c6cbd..0c12f14832 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -129,10 +129,9 @@ public: const LLMatrix4& getRelativeXform() const { return mRelativeXform; } const LLMatrix3& getRelativeXformInvTrans() const { return mRelativeXformInvTrans; } /*virtual*/ const LLMatrix4 getRenderMatrix() const; - typedef std::map<LLUUID, S32> texture_cost_t; - U32 getRenderCost(texture_cost_t &textures) const; + U32 getRenderCost(std::set<LLUUID> &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, @@ -359,6 +358,8 @@ public: static LLPointer<LLObjectMediaDataClient> sObjectMediaClient; static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient; + static const U32 ARC_TEXTURE_COST = 5; + protected: static S32 sNumLODChanges; |