EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates

fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter

1 files changed, 7 insertions, 6 deletions

diff --git a/indra/llmath/llcoord.h b/indra/llmath/llcoord.h
index 0b1d7e04f5..1f617e649e 100644
--- a/indra/llmath/llcoord.h
+++ b/indra/llmath/llcoord.h
@@ -26,9 +26,12 @@
 #ifndef LL_LLCOORD_H
 #define LL_LLCOORD_H
 
-struct LL_COORD_TYPE_COMMON 
+struct LLCoordCommon
 {
-	typedef S32 value_t;
+	LLCoordCommon(S32 x, S32 y) : mX(x), mY(y) {}
+	LLCoordCommon() : mX(0), mY(0) {}
+	S32 mX;
+	S32 mY;
 };
 
 // A two-dimensional pixel value
@@ -45,12 +48,12 @@ public:
 	LLCoord(S32 x, S32 y): mX(x), mY(y)
 	{}
 
-	LLCoord(const LLCoord<LL_COORD_TYPE_COMMON>& other)
+	LLCoord(const LLCoordCommon& other)
 	{
 		COORD_FRAME::convertFromCommon(other);
 	}
 
-	LLCoord<LL_COORD_TYPE_COMMON> convert() const
+	LLCoordCommon convert() const
 	{
 		return COORD_FRAME::convertToCommon();
 	}
@@ -61,8 +64,6 @@ public:
 
 };
 
-typedef LLCoord<LL_COORD_TYPE_COMMON> LLCoordCommon;
-
 struct LL_COORD_TYPE_GL 
 {
 	typedef S32 value_t;