diff options
author | Melanie | 2012-11-13 17:37:39 +0000 |
---|---|---|
committer | Melanie | 2012-11-13 17:37:39 +0000 |
commit | 556d70feef060135b6d60043fbd1bf2f29deabd7 (patch) | |
tree | 1a2656180525e694149096a5af1fa5a66d7ba105 /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Deleted .addin.xml. Added AssemblyInfo.cs (diff) | |
download | opensim-SC_OLD-556d70feef060135b6d60043fbd1bf2f29deabd7.zip opensim-SC_OLD-556d70feef060135b6d60043fbd1bf2f29deabd7.tar.gz opensim-SC_OLD-556d70feef060135b6d60043fbd1bf2f29deabd7.tar.bz2 opensim-SC_OLD-556d70feef060135b6d60043fbd1bf2f29deabd7.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index edd9707..cc266df 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -30,6 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using log4net; | 32 | using log4net; |
33 | using Mono.Addins; | ||
33 | using Nini.Config; | 34 | using Nini.Config; |
34 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
35 | using OpenMetaverse; | 36 | using OpenMetaverse; |
@@ -43,6 +44,7 @@ using OpenSim.Services.Interfaces; | |||
43 | 44 | ||
44 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | 45 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
45 | { | 46 | { |
47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MessageTransferModule")] | ||
46 | public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule | 48 | public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule |
47 | { | 49 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |