diff options
| author | Melanie | 2012-11-13 02:10:09 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-13 02:10:09 +0000 |
| commit | 9a5679876ed158f9944f209cbb68f370fabe8d12 (patch) | |
| tree | d5f282b13c448abec9f7329e88647cec459ede5f /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.zip opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.gz opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.bz2 opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs index bf1d787..7bf19c2 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | |||
| @@ -48,7 +48,7 @@ using OpenSim.Server.Handlers.Hypergrid; | |||
| 48 | 48 | ||
| 49 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | 49 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
| 50 | { | 50 | { |
| 51 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 51 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGMessageTransferModule")] |
| 52 | public class HGMessageTransferModule : ISharedRegionModule, IMessageTransferModule, IInstantMessageSimConnector | 52 | public class HGMessageTransferModule : ISharedRegionModule, IMessageTransferModule, IInstantMessageSimConnector |
| 53 | { | 53 | { |
| 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |