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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/llsprite.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llsprite.h b/indra/newview/llsprite.h index 04d30b8e7c..322150e85b 100644 --- a/indra/newview/llsprite.h +++ b/indra/newview/llsprite.h @@ -49,7 +49,6 @@ 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); |