diff options
| author | Melanie | 2013-01-26 01:56:23 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-26 01:56:23 +0000 |
| commit | e28c042dce141954477baa1a3babad9ce2a80e58 (patch) | |
| tree | 000f7091deb70abb6b8574d4107e91e259255f40 /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * This adds llVolumeDetect functionality to the C# implementation of BulletSim. (diff) | |
| download | opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.zip opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.tar.gz opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.tar.bz2 opensim-SC_OLD-e28c042dce141954477baa1a3babad9ce2a80e58.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | 2 |
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 f6e1d39..6bf50d2 100644 --- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | |||
| @@ -41,7 +41,7 @@ using System.Linq.Expressions; | |||
| 41 | namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | 41 | namespace 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 | public class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms |
| 45 | { | 45 | { |
| 46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
| 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |