diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-25 17:09:53 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-25 17:09:53 +0000 |
| commit | 5467853d8dee218a60268d056995bf4819684cfd (patch) | |
| tree | c7a6ee02b8b66695cc1bca619b6c756ebbaeffd6 /indra/newview/llvovolume.h | |
| parent | e71fdf32da50e3f5cb481c040add27a8a4f3777e (diff) | |
| parent | 6631e4d872fd4bd0208e44320e0b189b624cda86 (diff) | |
merge
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 70d203daf2..06e214b41e 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -121,7 +121,7 @@ public: const LLMatrix4& getRelativeXform() const { return mRelativeXform; } const LLMatrix3& getRelativeXformInvTrans() const { return mRelativeXformInvTrans; } /*virtual*/ const LLMatrix4 getRenderMatrix() const; - U32 getRenderCost() const; + U32 getRenderCost(std::set<LLUUID> &textures) const; /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face = -1, // which face to check, -1 = ALL_SIDES |