fix merge

This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
960 changed files with 23754 additions and 23741 deletions

View File

@@ -179,7 +179,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
TestHelpers.InMethod();
// TestHelpers.EnableLogging();
UUID npcId
UUID npcId
= m_npcMod.CreateNPC(
"John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, new AvatarAppearance());