diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 11:57:35 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 11:57:35 -0400 |
commit | 00ad0c425398dd748f4759243dc789199a73e87d (patch) | |
tree | 801ab4805be44117bda3a6d35e18161cc3ccd1c5 /indra/newview/llmanipscale.h | |
parent | e677e5e77114cfbfcd7c5e838922fdf8d12853fb (diff) | |
parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) |
merge up to latest viewer-development with mesh changes
Diffstat (limited to 'indra/newview/llmanipscale.h')
-rw-r--r-- | indra/newview/llmanipscale.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h index 5559f557c0..5cb8898fd0 100644 --- a/indra/newview/llmanipscale.h +++ b/indra/newview/llmanipscale.h @@ -39,6 +39,9 @@ #include "llviewerobject.h" #include "llbbox.h" + +F32 get_default_max_prim_scale(bool is_flora = false); + class LLToolComposite; class LLColor4; |