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/OptionalModules/World/NPC | |
| 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/OptionalModules/World/NPC')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index b07ae5b..8c9c006 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -43,7 +43,7 @@ using OpenSim.Services.Interfaces; | |||
| 43 | 43 | ||
| 44 | namespace OpenSim.Region.OptionalModules.World.NPC | 44 | namespace OpenSim.Region.OptionalModules.World.NPC |
| 45 | { | 45 | { |
| 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "NPCModule")] |
| 47 | public class NPCModule : INPCModule, ISharedRegionModule | 47 | public class NPCModule : INPCModule, ISharedRegionModule |
| 48 | { | 48 | { |
| 49 | private static readonly ILog m_log = LogManager.GetLogger( | 49 | private static readonly ILog m_log = LogManager.GetLogger( |