Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs

@@ -166,6 +166,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_sceneList[0];
         }
 
+        public ISimulationService GetInnerService()
+        {
+            return this;
+        }
+
         /**
          * Agent-related communications
          */

OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs

@@ -156,6 +156,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_localBackend.GetScene(handle);
         }
 
+        public ISimulationService GetInnerService()
+        {
+            return m_localBackend;
+        }
+
         /**
          * Agent-related communications
          */

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;
                         }
                     }
                 }

OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs

@@ -55,6 +55,7 @@ namespace OpenSim.Server.Handlers.Simulation
 
             //Object[] args = new Object[] { config };
             m_LocalSimulationService = scene.RequestModuleInterface<ISimulationService>();
+            m_LocalSimulationService = m_LocalSimulationService.GetInnerService();
                     //ServerUtils.LoadPlugin<ISimulationService>(simService, args);
 
             //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no"));

OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs

@@ -63,6 +63,11 @@ namespace OpenSim.Services.Connectors.Simulation
             return null;
         }
 
+        public ISimulationService GetInnerService()
+        {
+            return null;
+        }
+
         #region Agents
 
         protected virtual string AgentPath()

OpenSim/Services/Interfaces/ISimulationService.cs

@@ -36,6 +36,7 @@ namespace OpenSim.Services.Interfaces
     public interface ISimulationService
     {
         IScene GetScene(ulong regionHandle);
+        ISimulationService GetInnerService();
 
         #region Agents