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/Lure | |
| 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/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index 1949459..f3adb95 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
| @@ -29,6 +29,7 @@ using System; | |||
| 29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
| 30 | using System.Reflection; | 30 | using System.Reflection; |
| 31 | using log4net; | 31 | using log4net; |
| 32 | using Mono.Addins; | ||
| 32 | using Nini.Config; | 33 | using Nini.Config; |
| 33 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| @@ -37,6 +38,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 37 | 38 | ||
| 38 | namespace OpenSim.Region.CoreModules.Avatar.Lure | 39 | namespace OpenSim.Region.CoreModules.Avatar.Lure |
| 39 | { | 40 | { |
| 41 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LureModule")] | ||
| 40 | public class LureModule : ISharedRegionModule | 42 | public class LureModule : ISharedRegionModule |
| 41 | { | 43 | { |
| 42 | private static readonly ILog m_log = LogManager.GetLogger( | 44 | private static readonly ILog m_log = LogManager.GetLogger( |