Merge branch 'master' into careminster

author: Melanie 2012-04-18 00:28:33 +0100
committer: Melanie 2012-04-18 00:28:33 +0100
commit: fc9f244a7da6f5b4507278988259cfc54e0dd375 (patch)
tree: 0ee0202e5f6acf9ebfbd1fd0442a0c6b9f1e3fcc /OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
parent: Merge branch 'master' into careminster (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.zip
opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.gz
opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.bz2
opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index cab30de..74a85e2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -38,7 +38,7 @@ using OpenMetaverse;
 using System.Linq;
 using System.Linq.Expressions;
-namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
+namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
 {
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")]
    class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms
author	Melanie	2012-04-18 00:28:33 +0100
committer	Melanie	2012-04-18 00:28:33 +0100
commit	fc9f244a7da6f5b4507278988259cfc54e0dd375 (patch)
tree	0ee0202e5f6acf9ebfbd1fd0442a0c6b9f1e3fcc /OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.zip opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.gz opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.bz2 opensim-SC-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs index cab30de..74a85e2 100644 --- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -38,7 +38,7 @@ using OpenMetaverse;
38	using System.Linq;	38	using System.Linq;
39	using System.Linq.Expressions;	39	using System.Linq.Expressions;
40		40
41	namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms	41	namespace OpenSim.Region.OptionalModules.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