Restoring LoadPlugin as it was before. Justin's last change made it throw.
parent
4e180e84e2
commit
76106e39d9
OpenSim/Server/Base
|
@ -104,7 +104,20 @@ namespace OpenSim.Server.Base
|
||||||
|
|
||||||
if (typeInterface != null)
|
if (typeInterface != null)
|
||||||
{
|
{
|
||||||
return (T)Activator.CreateInstance(pluginType, args);
|
T plug = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
plug = (T)Activator.CreateInstance(pluginType,
|
||||||
|
args);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (!(e is System.MissingMethodException))
|
||||||
|
m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return plug;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue