diff options
author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
---|---|---|
committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
commit | d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch) | |
tree | 56b3723fed44031e888de9019b1ad127acdb1806 /indra/newview/llsprite.h | |
parent | e1e1212daae33723e7da325f295a5c3a6bb78979 (diff) |
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llsprite.h')
-rw-r--r-- | indra/newview/llsprite.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsprite.h b/indra/newview/llsprite.h index 322150e85b..04d30b8e7c 100644 --- a/indra/newview/llsprite.h +++ b/indra/newview/llsprite.h @@ -49,6 +49,7 @@ class LLSprite { public: LLSprite(const LLUUID &image_uuid); + LLSprite(const LLUUID &image_uuid, const F32 width, const F32 height, const BOOL b_usemipmap = TRUE); ~LLSprite(); void render(LLViewerCamera * camerap); |