diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
commit | d5f96c38e6f5838672c87e540aaaa3b1663837f8 (patch) | |
tree | 3aac617ceed3eb3ae2a1aa6cfaca9bb96d4ff4c7 /indra/newview/llmanipscale.h | |
parent | 84202f19a52b8d04bf900a72acf4214b73acc820 (diff) | |
parent | 4b7793a119f4e4c8c4f03b6ff9adb0eb6fe94209 (diff) |
merge from viewer-pre-beta
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; |