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/ServiceConnectorsIn/Hypergrid | |
| 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 '')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs index f681ef2..f749295 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs | |||
| @@ -29,6 +29,7 @@ using System; | |||
| 29 | using System.Reflection; | 29 | using System.Reflection; |
| 30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
| 31 | using log4net; | 31 | using log4net; |
| 32 | using Mono.Addins; | ||
| 32 | using Nini.Config; | 33 | using Nini.Config; |
| 33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| 34 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
| @@ -42,6 +43,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
| 42 | 43 | ||
| 43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid | 44 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid |
| 44 | { | 45 | { |
| 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HypergridServiceInConnectorModule")] | ||
| 45 | public class HypergridServiceInConnectorModule : ISharedRegionModule | 47 | public class HypergridServiceInConnectorModule : ISharedRegionModule |
| 46 | { | 48 | { |
| 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |