aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorRobert Adams2014-01-28 08:50:28 -0800
committerRobert Adams2014-01-28 08:50:28 -0800
commit8eec717f5f0f34354a73dcfeecdd3e9514d5e435 (patch)
treefec59ef61f8782d21641a3a16080493d20a420b1 /OpenSim/Region/OptionalModules
parentvarregion: fix for teleporting by double clicking on a map location. (diff)
parentMerge branch 'justincc-master' (diff)
downloadopensim-SC-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.zip
opensim-SC-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.tar.gz
opensim-SC-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.tar.bz2
opensim-SC-8eec717f5f0f34354a73dcfeecdd3e9514d5e435.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 7f9e440..c65794e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -110,8 +110,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
110 // ScenePresence.SendInitialData() to reset our entire appearance. 110 // ScenePresence.SendInitialData() to reset our entire appearance.
111 m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); 111 m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
112 112
113/* 113 m_afMod.SetAppearance(sp, originalTe, null, null);
114 m_afMod.SetAppearance(sp, originalTe, null);
115 114
116 UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance); 115 UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
117 116
@@ -126,7 +125,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
126 125
127 // Have to account for both SP and NPC. 126 // Have to account for both SP and NPC.
128 Assert.That(m_scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(2)); 127 Assert.That(m_scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(2));
129*/
130 } 128 }
131 129
132 [Test] 130 [Test]