OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restoring LoadPlugin as it was before. Justin's last change made it throw.

slimupdates
Diva Canto 2010-03-15 19:34:14 -07:00
parent 4e180e84e2
commit 76106e39d9
3 changed files with 2861 additions and 2848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4402
OpenSim/Region/Physics/Meshing/PrimMesher.cs
View File

File diff suppressed because it is too large Load Diff

1290
OpenSim/Region/Physics/Meshing/SculptMesh.cs
View File

File diff suppressed because it is too large Load Diff

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

@ -101,10 +101,23 @@ namespace OpenSim.Server.Base
continue; continue;
Type typeInterface = pluginType.GetInterface(interfaceName, true); Type typeInterface = pluginType.GetInterface(interfaceName, true);
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;
} }
} }
} }