aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorMelanie2012-11-15 00:43:26 +0000
committerMelanie2012-11-15 00:43:26 +0000
commit06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e (patch)
tree845198db417e19540641316f7a8a09c8169e7086 /OpenSim/Region/OptionalModules/Scripting
parentMerge branch 'master' into careminster (diff)
parentAdded AssemblyInfos in the OpenSim.Server namespace dlls. (diff)
downloadopensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.zip
opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.gz
opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.bz2
opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index bad75f7..c550c44 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -32,6 +32,7 @@ using System.Net;
32using System.IO; 32using System.IO;
33using System.Text; 33using System.Text;
34using log4net; 34using log4net;
35using Mono.Addins;
35using Nini.Config; 36using Nini.Config;
36using OpenMetaverse; 37using OpenMetaverse;
37using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
@@ -42,6 +43,7 @@ using OpenSim.Services.Interfaces;
42 43
43namespace OpenSim.Region.OptionalModules.Scripting.RegionReady 44namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
44{ 45{
46 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionReadyModule")]
45 public class RegionReadyModule : IRegionReadyModule, INonSharedRegionModule 47 public class RegionReadyModule : IRegionReadyModule, INonSharedRegionModule
46 { 48 {
47 private static readonly ILog m_log = 49 private static readonly ILog m_log =