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/Scripting/LSLHttp | |
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/Scripting/LSLHttp')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 0b9174f..da59eab 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.Collections; | 31 | using System.Collections; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using log4net; | 33 | using log4net; |
34 | using Mono.Addins; | ||
34 | using Nini.Config; | 35 | using Nini.Config; |
35 | using OpenMetaverse; | 36 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
@@ -66,6 +67,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
66 | public string uri; | 67 | public string uri; |
67 | } | 68 | } |
68 | 69 | ||
70 | /// <summary> | ||
71 | /// This module provides external URLs for in-world scripts. | ||
72 | /// </summary> | ||
73 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UrlModule")] | ||
69 | public class UrlModule : ISharedRegionModule, IUrlModule | 74 | public class UrlModule : ISharedRegionModule, IUrlModule |
70 | { | 75 | { |
71 | private static readonly ILog m_log = | 76 | private static readonly ILog m_log = |