diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
commit | 49b37a4dc362679e94fe04ff3cd7094f0e0e9f68 (patch) | |
tree | 9832afd6820bc0122fb8eef0552bbfab58736492 /indra/llmath/llvolumemgr.h | |
parent | c3a71b7dcbfe855058a84e22651aea3910133aa1 (diff) | |
parent | 8bafcc0491d0131a53226365f18b3ba68648a742 (diff) |
merge from viewer2, conflicts resolved...
Diffstat (limited to 'indra/llmath/llvolumemgr.h')
-rw-r--r-- | indra/llmath/llvolumemgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmath/llvolumemgr.h b/indra/llmath/llvolumemgr.h index a78ea76a1a..f5dc4cd748 100644 --- a/indra/llmath/llvolumemgr.h +++ b/indra/llmath/llvolumemgr.h @@ -59,6 +59,7 @@ public: static S32 getDetailFromTan(const F32 tan_angle); static void getDetailProximity(const F32 tan_angle, F32 &to_lower, F32& to_higher); static F32 getVolumeScaleFromDetail(const S32 detail); + static S32 getVolumeDetailFromScale(F32 scale); LLVolume* refLOD(const S32 detail); BOOL derefLOD(LLVolume *volumep); |