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/llviewertexturelist.cpp | |
| parent | d4845c1d263c07aaa0b8c2c638cd2a214e166bdd (diff) | |
| parent | 540e2d8e5d0c5ad9cecc68fd03f86335e96a9318 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index f2a3839f97..31f0998fab 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1411,7 +1411,7 @@ LLUIImagePtr LLUIImageList::loadUIImage(LLViewerFetchedTexture* imagep, const st datap->mImageName = name; datap->mImageScaleRegion = scale_rect; - imagep->setLoadedCallback(onUIImageLoaded, 0, FALSE, FALSE, datap, NULL, NULL); + imagep->setLoadedCallback(onUIImageLoaded, 0, FALSE, FALSE, datap, NULL); } return new_imagep; } |