diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs index d38af23..c14bce7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs | |||
| @@ -42,7 +42,7 @@ using OpenSim.Services.Interfaces; | |||
| 42 | 42 | ||
| 43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage | 43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage |
| 44 | { | 44 | { |
| 45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceInConnectorModule")] |
| 46 | public class MapImageServiceInConnectorModule : ISharedRegionModule | 46 | public class MapImageServiceInConnectorModule : ISharedRegionModule |
| 47 | { | 47 | { |
| 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| @@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage | |||
| 50 | 50 | ||
| 51 | private IConfigSource m_Config; | 51 | private IConfigSource m_Config; |
| 52 | 52 | ||
| 53 | #region IRegionModule interface | 53 | #region Region Module interface |
| 54 | 54 | ||
| 55 | public void Initialise(IConfigSource config) | 55 | public void Initialise(IConfigSource config) |
| 56 | { | 56 | { |