Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated

1 files changed, 22 insertions, 10 deletions

diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp
index 1348f85201..f74173425c 100644
--- a/indra/newview/llsprite.cpp
+++ b/indra/newview/llsprite.cpp
@@ -59,18 +59,30 @@ LLVector3 LLSprite::sNormal(0.0f,0.0f,0.0f);
 //////////////////////////////////////////////////////////////////////
 
 // A simple initialization
-LLSprite::LLSprite(const LLUUID &image_uuid) :
-	mImageID(image_uuid),
-	mImagep(NULL),
-	mPitch(0.f),
-	mYaw(0.f),
-	mPosition(0.0f, 0.0f, 0.0f),
-	mFollow(TRUE),
-	mUseCameraUp(TRUE),
-	mColor(0.5f, 0.5f, 0.5f, 1.0f),
-	mTexMode(GL_REPLACE)
+LLSprite::LLSprite(const LLUUID &image_uuid)
 {
+	mImageID = image_uuid;
+	mImagep = NULL;
+
 	setSize(1.0f, 1.0f);
+	setPosition(LLVector3(0.0f, 0.0f, 0.0f));
+	mTexMode = GL_REPLACE;
+	mColor.setVec(0.5f, 0.5f, 0.5f, 1.0f);
+	mFollow = TRUE;
+	mUseCameraUp = TRUE;
+}
+
+LLSprite::LLSprite(const LLUUID &image_uuid, const F32 width, const F32 height, const BOOL b_usemipmap)
+{
+	mImageID = image_uuid;
+	mImagep = NULL;
+
+	setSize(width,height);
+	setPosition(LLVector3(0.0f, 0.0f, 0.0f));
+	mTexMode = GL_REPLACE;
+	mColor.setVec(0.5f, 0.5f, 0.5f, 1.0f);
+	mFollow = TRUE;
+	mUseCameraUp = TRUE;
 }
 
 //////////////////////////////////////////////////////////////////////