QAR-570 maint-render-4 merge

merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index dfc5d4520b..c71ba1b3c2 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -58,14 +58,14 @@ void fallbackDestroyLLImageJ2CImpl(LLImageJ2CImpl* impl)
 }
 
 /**
-sample error callback expecting a FILE* client object
+sample error callback expecting a LLFILE* client object
 */
 void error_callback(const char* msg, void*)
 {
 	lldebugs << "LLImageJ2CImpl error_callback: " << msg << llendl;
 }
 /**
-sample warning callback expecting a FILE* client object
+sample warning callback expecting a LLFILE* client object
 */
 void warning_callback(const char* msg, void*)
 {