diff options
| author | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
| commit | 38558960978a0741dd9c79c4c7a108b8a1f99eff (patch) | |
| tree | b7221183a7c91c1097a78cf5875197431852b0b8 /indra/newview/llsprite.cpp | |
| parent | e77de5d685ae441f72920f0e04d9887ee958745a (diff) | |
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llsprite.cpp')
| -rw-r--r-- | indra/newview/llsprite.cpp | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp index f74173425c..1348f85201 100644 --- a/indra/newview/llsprite.cpp +++ b/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; } ////////////////////////////////////////////////////////////////////// |