diff options
| author | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
| commit | c03e366a6022d13fcf7b7e502daff8c72f7b64ee (patch) | |
| tree | 6f92e21824332b5357f8befe4c978b83dbaa1aef /indra/llcommon/llunit.h | |
| parent | 27de692bd7b297c9cd0fd6abcdee4b3e2486ec52 (diff) | |
| parent | 11e14cd3b0f58225a96b9b7a9839a7f030fe4045 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llunit.h')
| -rw-r--r-- | indra/llcommon/llunit.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index c9bbed5574..79465715cf 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -571,6 +571,11 @@ LL_DECLARE_DERIVED_UNIT(Gigahertz, "GHz", Megahertz, * 1000); LL_DECLARE_BASE_UNIT(Radians, "rad"); LL_DECLARE_DERIVED_UNIT(Degrees, "deg", Radians, * 0.01745329251994); +LL_DECLARE_BASE_UNIT(Percent, "%"); +LL_DECLARE_DERIVED_UNIT(Ratio, "x", Percent, / 100); + +LL_DECLARE_BASE_UNIT(Triangles, "tris"); +LL_DECLARE_DERIVED_UNIT(Kilotriangles, "ktris", Triangles, * 1000); } // namespace LLUnits |