ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Hurliman
2010-03-15 20:54:57 -07:00
parent 65c1fbc14d 45ef3e9987
commit 3be2b592b2
6 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
View File

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

5
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
View File

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

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

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

1
OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
View File

@@ -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"));

5
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

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

1
OpenSim/Services/Interfaces/ISimulationService.cs
View File

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