(repost to cut down message length)
-------- Original Message --------
Subject: Re: [Opensim-commits] [OpenSim Git Master Repository] master branch
updated. r/12443
Date: Tue, 16 Mar 2010 23:30:52 +0000
From: Justin Clark-Casey <[email protected]>
To: [email protected]
References: <[email protected]>
Hi Diva - does this mean that it is normal for some people to see a
System.MissingMethodException on plugin loading?
Also, just to check, did you actually mean to change PrimMesher.cs and
SculptMesh.cs as well or are these changes functionally neutral (e.g. line
ending adjustment)?
[email protected] wrote:
The branch, master has been updated
via 76106e3 Restoring LoadPlugin as it was before. Justin's last change
made it throw.
from 4e180e8 Merge branch 'master' of
ssh://opensimulator.org/var/git/opensim
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 76106e39d9cd48f136caf061ef9d19641bbdfd31
Author: Diva Canto <[email protected]>
Date: Mon Mar 15 19:34:14 2010 -0700
Restoring LoadPlugin as it was before. Justin's last change made it throw.
76106e39d9cd48f136caf061ef9d19641bbdfd31
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index 6e9654b..932943c 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -1,2201 +1,2201 @@
-/*
- * Copyright (c) Contributors
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
...
diff --git a/OpenSim/Server/Base/ServerUtils.cs
b/OpenSim/Server/Base/ServerUtils.cs
index a399672..e7a8294 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -101,10 +101,23 @@ namespace OpenSim.Server.Base
continue;
Type typeInterface = pluginType.GetInterface(interfaceName, true);
-
+
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;
}
}
}
-----------------------------------------------------------------------
Summary of changes:
OpenSim/Region/Physics/Meshing/PrimMesher.cs | 4402 +++++++++++++-------------
OpenSim/Region/Physics/Meshing/SculptMesh.cs | 1290 ++++----
OpenSim/Server/Base/ServerUtils.cs | 17 +-
3 files changed, 2861 insertions(+), 2848 deletions(-)
------------------------------------------------------------------------
_______________________________________________
Opensim-commits mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/opensim-commits
--
Justin Clark-Casey (justincc)
http://justincc.org
http://twitter.com/justincc
--
Justin Clark-Casey (justincc)
http://justincc.org
http://twitter.com/justincc
_______________________________________________
Opensim-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/opensim-dev
