ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Re-enable save oar test by loading asset data plugins from test mock class

Browse Source 
* Actually spit out the exception caught by the plugin loader - not much point having plugins throw exceptions if we are just going to ignore them
This commit is contained in:
Justin Clarke Casey
2009-05-18 17:46:14 +00:00
parent a885556063
commit ad7214620f
4 changed files with 206 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Server/Base/ServerUtils.cs
View File

@@ -31,11 +31,14 @@ using System.Reflection;
using System.Xml;
using System.Xml.Serialization;
using System.Text;
using log4net;
namespace OpenSim.Server.Base
{
public static class ServerUtils
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public static string SLAssetTypeToContentType(int assetType)
{
switch (assetType)
@@ -114,6 +117,9 @@ namespace OpenSim.Server.Base
try
{
//m_log.DebugFormat("[PLUGINS]: Loading plugins from {0}", System.IO.Directory.GetCurrentDirectory());
//m_log.DebugFormat("[PLUGINS]: Trying to load {0}", dllName);
Assembly pluginAssembly = Assembly.LoadFrom(dllName);
foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -141,6 +147,7 @@ namespace OpenSim.Server.Base
}
catch (Exception e)
{
m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e);
return null;
}
}