diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-16 16:40:29 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-16 16:40:29 +0300 |
| commit | 97a43e303b1dc0d2a6ca21c95555527b89d271b8 (patch) | |
| tree | 08955536d1fafbe3c00f260b9786b7bec01fa617 /indra/newview/llvoavatarself.cpp | |
| parent | a97485fa60f1b1f29d8109b79450ab993880529c (diff) | |
| parent | 565d5dc1a9a4617874710ce7ede82a30c203f03f (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index b80e47e11a..8961d2c285 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1633,7 +1633,7 @@ void LLVOAvatarSelf::setLocalTexture(ETextureIndex type, LLViewerTexture* src_te } else { - tex->setLoadedCallback(onLocalTextureLoaded, desired_discard, TRUE, FALSE, new LLAvatarTexData(getID(), type), NULL, NULL); + tex->setLoadedCallback(onLocalTextureLoaded, desired_discard, TRUE, FALSE, new LLAvatarTexData(getID(), type), NULL); } } tex->setMinDiscardLevel(desired_discard); |