diff options
| author | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
| commit | 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch) | |
| tree | 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |
| parent | Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff) | |
| parent | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff) | |
| download | opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index bc505a1..b2a1b23 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
| @@ -32,6 +32,7 @@ using System.Net; | |||
| 32 | using System.Reflection; | 32 | using System.Reflection; |
| 33 | using System.Text; | 33 | using System.Text; |
| 34 | using log4net; | 34 | using log4net; |
| 35 | using Mono.Addins; | ||
| 35 | using Nini.Config; | 36 | using Nini.Config; |
| 36 | using OpenMetaverse; | 37 | using OpenMetaverse; |
| 37 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
| @@ -46,6 +47,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
| 46 | 47 | ||
| 47 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | 48 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation |
| 48 | { | 49 | { |
| 50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteSimulationConnectorModule")] | ||
| 49 | public class RemoteSimulationConnectorModule : ISharedRegionModule, ISimulationService | 51 | public class RemoteSimulationConnectorModule : ISharedRegionModule, ISimulationService |
| 50 | { | 52 | { |
| 51 | private bool initialized = false; | 53 | private bool initialized = false; |