ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-01-26 01:56:23 +00:00
parent 0b8bf69470 5128ae7b86
commit e28c042dce
10 changed files with 523 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
View File

@@ -74,6 +74,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
[SetUp]
public void Init()
{
base.SetUp();
IConfigSource config = new IniConfigSource();
config.AddConfig("NPC");
config.Configs["NPC"].Set("Enabled", "true");

2
OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SceneCommandsModule")]
public class SceneCommandsModule : ISceneCommandsModule, INonSharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene;