diff options
author | Tofu Buzzard <no-email> | 2011-02-17 12:14:32 -0800 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:32 -0800 |
commit | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (patch) | |
tree | 4fd4be7a8e52b0e746468fd8822db8dab9c4861d /indra/newview/llmanipscale.h | |
parent | 8921bdf0577c1282d5aa9cd920f0b57b77d95682 (diff) | |
parent | 0ba198b94b85979bc970f2fcabf9df652d94e669 (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; |