diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
| commit | 290f2f05f7c2c061ba82f83594e4f7fb6a043ced (patch) | |
| tree | 648819527f93c4b398aaace5fb456afc983c2b15 /indra/llmath/llvolumemgr.h | |
| parent | 810a0b3dcee41ec657c94ccb26003b9b4e20e141 (diff) | |
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release
Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
Diffstat (limited to 'indra/llmath/llvolumemgr.h')
| -rw-r--r-- | indra/llmath/llvolumemgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llvolumemgr.h b/indra/llmath/llvolumemgr.h index fac194165b..f4b44b3a12 100644 --- a/indra/llmath/llvolumemgr.h +++ b/indra/llmath/llvolumemgr.h @@ -59,7 +59,7 @@ public: static void getDetailProximity(const F32 tan_angle, F32 &to_lower, F32& to_higher); static F32 getVolumeScaleFromDetail(const S32 detail); - LLVolume* getLODVolume(const S32 detail); + LLVolume* refLOD(const S32 detail); BOOL derefLOD(LLVolume *volumep); S32 getNumRefs() const { return mRefs; } |