Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-04-29 00:38:20 +01:00
7 changed files with 81 additions and 18 deletions

View File

@@ -286,6 +286,7 @@ namespace OpenSim.Server.Base
e.InnerException == null ? e.Message : e.InnerException.Message,
e.StackTrace);
}
m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1}", dllName, e.Message);
return null;
}