summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-08 17:29:56 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-08 17:29:56 -0700
commitac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch)
tree0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/llmath
parent1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff)
parentcdb57cb299097b203581a6ef99840350831c321c (diff)
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llcoord.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llcoord.h b/indra/llmath/llcoord.h
index a66f3c7424..9b76268afd 100644
--- a/indra/llmath/llcoord.h
+++ b/indra/llmath/llcoord.h
@@ -54,7 +54,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)
@@ -67,7 +67,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); }