diff options
author | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
commit | cf52fc85ae4d06335a09b4dd60bddeb7f66841b3 (patch) | |
tree | afa95f76e9ef3ebe9b91dce90d2a8671f28ab435 /indra/newview/llpreviewtexture.cpp | |
parent | 7c86d4434822d7a3172bed82c3812032089c1518 (diff) | |
parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) |
merge
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
-rw-r--r-- | indra/newview/llpreviewtexture.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 0ed6bea74f..76b02f07ec 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -304,12 +304,12 @@ void LLPreviewTexture::openToSave() // static void LLPreviewTexture::onFileLoadedForSave(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata) + LLViewerFetchedTexture *src_vi, + LLImageRaw* src, + LLImageRaw* aux_src, + S32 discard_level, + BOOL final, + void* userdata) { LLUUID* item_uuid = (LLUUID*) userdata; |