Merge branch 'curlthreading2' into curlthreading3

2012-09-06 15:12:22 +02:00
parent 83b13f6a3f e3752aefed
commit e7cd445491
4070 changed files with 25269 additions and 20661 deletions
--- a/indra/llplugin/llplugininstance.cpp
+++ b/indra/llplugin/llplugininstance.cpp
@@ -125,7 +125,7 @@ int LLPluginInstance::load(const std::string& plugin_dir, std::string &plugin_fi
 			buf[0] = 0;
 			if (error)
 			{
-				strncpy(buf, dlerror(), sizeof(buf));
+				strncpy(buf, error, sizeof(buf));
 			}
 			buf[sizeof(buf) - 1] = 0;
 		}