diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llsprite.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llsprite.cpp | 32 |
1 files changed, 10 insertions, 22 deletions
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); | |||
59 | ////////////////////////////////////////////////////////////////////// | 59 | ////////////////////////////////////////////////////////////////////// |
60 | 60 | ||
61 | // A simple initialization | 61 | // A simple initialization |
62 | LLSprite::LLSprite(const LLUUID &image_uuid) | 62 | LLSprite::LLSprite(const LLUUID &image_uuid) : |
63 | mImageID(image_uuid), | ||
64 | mImagep(NULL), | ||
65 | mPitch(0.f), | ||
66 | mYaw(0.f), | ||
67 | mPosition(0.0f, 0.0f, 0.0f), | ||
68 | mFollow(TRUE), | ||
69 | mUseCameraUp(TRUE), | ||
70 | mColor(0.5f, 0.5f, 0.5f, 1.0f), | ||
71 | mTexMode(GL_REPLACE) | ||
63 | { | 72 | { |
64 | mImageID = image_uuid; | ||
65 | mImagep = NULL; | ||
66 | |||
67 | setSize(1.0f, 1.0f); | 73 | setSize(1.0f, 1.0f); |
68 | setPosition(LLVector3(0.0f, 0.0f, 0.0f)); | ||
69 | mTexMode = GL_REPLACE; | ||
70 | mColor.setVec(0.5f, 0.5f, 0.5f, 1.0f); | ||
71 | mFollow = TRUE; | ||
72 | mUseCameraUp = TRUE; | ||
73 | } | ||
74 | |||
75 | LLSprite::LLSprite(const LLUUID &image_uuid, const F32 width, const F32 height, const BOOL b_usemipmap) | ||
76 | { | ||
77 | mImageID = image_uuid; | ||
78 | mImagep = NULL; | ||
79 | |||
80 | setSize(width,height); | ||
81 | setPosition(LLVector3(0.0f, 0.0f, 0.0f)); | ||
82 | mTexMode = GL_REPLACE; | ||
83 | mColor.setVec(0.5f, 0.5f, 0.5f, 1.0f); | ||
84 | mFollow = TRUE; | ||
85 | mUseCameraUp = TRUE; | ||
86 | } | 74 | } |
87 | 75 | ||
88 | ////////////////////////////////////////////////////////////////////// | 76 | ////////////////////////////////////////////////////////////////////// |