diff options
Diffstat (limited to 'linden/indra/llimage/llimagej2c.cpp')
-rw-r--r-- | linden/indra/llimage/llimagej2c.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
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() | |||
122 | j2cimpl_destroy_func = dest_func; | 122 | j2cimpl_destroy_func = dest_func; |
123 | j2cimpl_engineinfo_func = engineinfo_func; | 123 | j2cimpl_engineinfo_func = engineinfo_func; |
124 | all_functions_loaded = true; | 124 | all_functions_loaded = true; |
125 | LL_INFOS("LLKDU") << "Optional J2C renderer " << dso_name << " found at " << dso_path << LL_ENDL; | ||
125 | } | 126 | } |
126 | } | 127 | } |
127 | } | 128 | } |
@@ -132,17 +133,17 @@ void LLImageJ2C::openDSO() | |||
132 | //something went wrong with the DSO or function loading.. | 133 | //something went wrong with the DSO or function loading.. |
133 | //fall back onto our satefy impl creation function | 134 | //fall back onto our satefy impl creation function |
134 | 135 | ||
135 | #if 0 | ||
136 | // precious verbose debugging, sadly we can't use our | 136 | // precious verbose debugging, sadly we can't use our |
137 | // 'llinfos' stream etc. this early in the initialisation seq. | 137 | // 'llinfos' stream etc. this early in the initialisation seq. |
138 | // Want to bet? -- MC | ||
139 | if (dso_path.empty()) dso_path = "not found"; | ||
138 | char errbuf[256]; | 140 | char errbuf[256]; |
139 | fprintf(stderr, "failed to load syms from DSO %s (%s)\n", | 141 | LL_INFOS("LLKDU") << "failed to load syms from optional DSO " << dso_name |
140 | dso_name.c_str(), dso_path.c_str()); | 142 | << " (" << dso_path << ")" << LL_ENDL; |
141 | apr_strerror(rv, errbuf, sizeof(errbuf)); | 143 | apr_strerror(rv, errbuf, sizeof(errbuf)); |
142 | fprintf(stderr, "error: %d, %s\n", rv, errbuf); | 144 | LL_INFOS("LLKDU") << "error: " << rv << ", " << errbuf << LL_ENDL; |
143 | apr_dso_error(j2cimpl_dso_handle, errbuf, sizeof(errbuf)); | 145 | apr_dso_error(j2cimpl_dso_handle, errbuf, sizeof(errbuf)); |
144 | fprintf(stderr, "dso-error: %d, %s\n", rv, errbuf); | 146 | LL_INFOS("LLKDU") << "dso-error: " << rv << ", " << errbuf << LL_ENDL; |
145 | #endif | ||
146 | 147 | ||
147 | if ( j2cimpl_dso_handle ) | 148 | if ( j2cimpl_dso_handle ) |
148 | { | 149 | { |