aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2012-11-12 18:08:27 -0800
committerDiva Canto2012-11-12 18:08:27 -0800
commit335ff4359c2370dfbd353af851bf4370e030b1bb (patch)
tree26440d1396dce316ebef88bd9306cdd5994a7546
parentCleanup on region modules: gave short node id's to all of them. (diff)
parentUpdate ScriptModuleComms name space to CoreModules (diff)
downloadopensim-SC_OLD-335ff4359c2370dfbd353af851bf4370e030b1bb.zip
opensim-SC_OLD-335ff4359c2370dfbd353af851bf4370e030b1bb.tar.gz
opensim-SC_OLD-335ff4359c2370dfbd353af851bf4370e030b1bb.tar.bz2
opensim-SC_OLD-335ff4359c2370dfbd353af851bf4370e030b1bb.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index dc54c3f..f6e1d39 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -38,7 +38,7 @@ using OpenMetaverse;
38using System.Linq; 38using System.Linq;
39using System.Linq.Expressions; 39using System.Linq.Expressions;
40 40
41namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms 41namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
42{ 42{
43 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")] 43 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")]
44 class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms 44 class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms