From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/newview/llsprite.cpp | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

(limited to 'linden/indra/newview/llsprite.cpp')

diff --git a/linden/indra/newview/llsprite.cpp b/linden/indra/newview/llsprite.cpp
index 624e03d..7da1d48 100644
--- a/linden/indra/newview/llsprite.cpp
+++ b/linden/indra/newview/llsprite.cpp
@@ -59,30 +59,18 @@ LLVector3 LLSprite::sNormal(0.0f,0.0f,0.0f);
 //////////////////////////////////////////////////////////////////////
 
 // A simple initialization
-LLSprite::LLSprite(const LLUUID &image_uuid)
+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)
 {
-	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;
 }
 
 //////////////////////////////////////////////////////////////////////
-- 
cgit v1.1