From 553a35d3ff586335ca4d1dd911e9180541361e9b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 1 Aug 2010 15:33:18 -0700
Subject: Added loading kdu debugging info to the log

---
 linden/indra/llimage/llimagej2c.cpp              | 13 +++++++------
 linden/indra/newview/app_settings/logcontrol.xml |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 5480c88..b99ebff 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -122,6 +122,7 @@ void LLImageJ2C::openDSO()
 					j2cimpl_destroy_func = dest_func;
 					j2cimpl_engineinfo_func = engineinfo_func;
 					all_functions_loaded = true;
+					LL_INFOS("LLKDU") << "Optional J2C renderer " << dso_name << " found at " << dso_path << LL_ENDL;
 				}
 			}
 		}
@@ -132,17 +133,17 @@ void LLImageJ2C::openDSO()
 		//something went wrong with the DSO or function loading..
 		//fall back onto our satefy impl creation function
 
-#if 0
 		// precious verbose debugging, sadly we can't use our
 		// 'llinfos' stream etc. this early in the initialisation seq.
+		// Want to bet? -- MC
+		if (dso_path.empty()) dso_path = "not found";
 		char errbuf[256];
-		fprintf(stderr, "failed to load syms from DSO %s (%s)\n",
-			dso_name.c_str(), dso_path.c_str());
+		LL_INFOS("LLKDU") << "failed to load syms from optional DSO " << dso_name 
+			<< " (" << dso_path << ")" << LL_ENDL;
 		apr_strerror(rv, errbuf, sizeof(errbuf));
-		fprintf(stderr, "error: %d, %s\n", rv, errbuf);
+		LL_INFOS("LLKDU") << "error: " << rv << ", " << errbuf << LL_ENDL;
 		apr_dso_error(j2cimpl_dso_handle, errbuf, sizeof(errbuf));
-		fprintf(stderr, "dso-error: %d, %s\n", rv, errbuf);
-#endif
+		LL_INFOS("LLKDU") << "dso-error: " << rv << ", " << errbuf << LL_ENDL;
 
 		if ( j2cimpl_dso_handle )
 		{
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index cff9a56..4d3288f 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -20,6 +20,7 @@
 					<key>tags</key>
 						<array>
 							<string>AppInit</string>
+              <string>LLKDU</string>
 							<string>SystemInfo</string>
 							<string>TextureCache</string>
 							<string>AppCache</string>
-- 
cgit v1.1