summaryrefslogtreecommitdiff
path: root/indra/llmath/llmath.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-26 01:52:28 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-26 01:52:28 -0800
commit2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (patch)
tree5e956b1e9bfc1efd65bcd365abac613b4d4baf04 /indra/llmath/llmath.h
parent5c73a908353cdd7210e3148f7162d30afab7873a (diff)
parent6ea944b38f1e619df2c52283f6b33bbcc1cbbc40 (diff)
automated merge
Diffstat (limited to 'indra/llmath/llmath.h')
-rw-r--r--indra/llmath/llmath.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 7a5d51ff76..209b506c30 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -203,7 +203,7 @@ inline S32 llfloor( F32 f )
}
return result;
#else
- return (S32)floor(f);
+ return (S32)floorf(f);
#endif
}