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/llviewertexturelist.cpp | |
| parent | a97485fa60f1b1f29d8109b79450ab993880529c (diff) | |
| parent | 565d5dc1a9a4617874710ce7ede82a30c203f03f (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; } |