diff options
| author | Melanie | 2012-11-13 02:10:09 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-13 02:10:09 +0000 |
| commit | 9a5679876ed158f9944f209cbb68f370fabe8d12 (patch) | |
| tree | d5f282b13c448abec9f7329e88647cec459ede5f /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.zip opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.gz opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.bz2 opensim-SC-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 5f9aa42..87a0537 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
| @@ -90,7 +90,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 90 | 90 | ||
| 91 | namespace OpenSim.Region.CoreModules.Scripting.WorldComm | 91 | namespace OpenSim.Region.CoreModules.Scripting.WorldComm |
| 92 | { | 92 | { |
| 93 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 93 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WorldCommModule")] |
| 94 | public class WorldCommModule : IWorldComm, INonSharedRegionModule | 94 | public class WorldCommModule : IWorldComm, INonSharedRegionModule |
| 95 | { | 95 | { |
| 96 | // private static readonly ILog m_log = | 96 | // private static readonly ILog m_log = |