diff options
author | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
commit | 03c738d0c9df57a786803a292bc766e78d014749 (patch) | |
tree | 08c8e8529056d12240fa4e71987b54c2ce28d2f4 /indra/newview/llmanipscale.h | |
parent | d8e04b9d31b0c77289f5f770f2a9b54506650151 (diff) | |
parent | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (diff) |
merge
Diffstat (limited to 'indra/newview/llmanipscale.h')
-rw-r--r-- | indra/newview/llmanipscale.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h index 2762433abf..5cb8898fd0 100644 --- a/indra/newview/llmanipscale.h +++ b/indra/newview/llmanipscale.h @@ -40,7 +40,7 @@ #include "llbbox.h" -F32 get_default_max_prim_scale(); +F32 get_default_max_prim_scale(bool is_flora = false); class LLToolComposite; class LLColor4; |