diff options
| author | Richard Linden <none@none> | 2012-02-23 12:39:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:39:59 -0800 |
| commit | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (patch) | |
| tree | ec895147f9ccd201203e9b23433b9bb921278f03 /indra/llmath | |
| parent | 11d29660aa84a1a8a61e427698715497a57243c2 (diff) | |
| parent | 9da67fff0a21ae7af2f99c90be267b089eaafeb6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llcoord.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llcoord.h b/indra/llmath/llcoord.h index 1f617e649e..756e23dbdf 100644 --- a/indra/llmath/llcoord.h +++ b/indra/llmath/llcoord.h @@ -45,7 +45,7 @@ public: LLCoord(): mX(0), mY(0) {} - LLCoord(S32 x, S32 y): mX(x), mY(y) + LLCoord(typename COORD_FRAME::value_t x, typename COORD_FRAME::value_t y): mX(x), mY(y) {} LLCoord(const LLCoordCommon& other) @@ -58,7 +58,7 @@ public: return COORD_FRAME::convertToCommon(); } - void set(S32 x, S32 y) { mX = x; mY = y;} + void set(typename COORD_FRAME::value_t x, typename COORD_FRAME::value_t y) { mX = x; mY = y;} bool operator==(const self_t& other) const { return mX == other.mX && mY == other.mY; } bool operator!=(const self_t& other) const { return !(*this == other); } |