diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-07-15 15:17:49 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-07-15 15:17:49 -0600 |
| commit | 565d5dc1a9a4617874710ce7ede82a30c203f03f (patch) | |
| tree | 63d42863902d9040c537bb1e91ce1cdb7b70091b /indra/newview/llvoavatarself.cpp | |
| parent | d4845c1d263c07aaa0b8c2c638cd2a214e166bdd (diff) | |
| parent | 540e2d8e5d0c5ad9cecc68fd03f86335e96a9318 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
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); |