diff options
author | teravus | 2012-11-15 09:46:41 -0500 |
---|---|---|
committer | teravus | 2012-11-15 09:46:41 -0500 |
commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Region/OptionalModules/World/NPC | |
parent | * Fixes mesh loading issues in last commit. (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz |
Merge master into teravuswork
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 11 |
2 files changed, 22 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 6c8e2fc..3a03101 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
148 | OnInstantMessage(this, new GridInstantMessage(m_scene, | 148 | OnInstantMessage(this, new GridInstantMessage(m_scene, |
149 | m_uuid, m_firstname + " " + m_lastname, | 149 | m_uuid, m_firstname + " " + m_lastname, |
150 | target, 0, false, message, | 150 | target, 0, false, message, |
151 | UUID.Zero, false, Position, new byte[0])); | 151 | UUID.Zero, false, Position, new byte[0], true)); |
152 | } | 152 | } |
153 | 153 | ||
154 | public void SendAgentOffline(UUID[] agentIDs) | 154 | public void SendAgentOffline(UUID[] agentIDs) |
@@ -607,13 +607,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
607 | { | 607 | { |
608 | } | 608 | } |
609 | 609 | ||
610 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, | 610 | public virtual void SendChatMessage( |
611 | UUID fromAgentID, byte source, byte audible) | 611 | string message, byte type, Vector3 fromPos, string fromName, |
612 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
612 | { | 613 | { |
613 | } | 614 | } |
614 | 615 | ||
615 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, | 616 | public virtual void SendChatMessage( |
616 | UUID fromAgentID, byte source, byte audible) | 617 | byte[] message, byte type, Vector3 fromPos, string fromName, |
618 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
617 | { | 619 | { |
618 | } | 620 | } |
619 | 621 | ||
@@ -909,11 +911,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
909 | 911 | ||
910 | public void Close() | 912 | public void Close() |
911 | { | 913 | { |
912 | Close(true); | 914 | Close(true, false); |
913 | } | 915 | } |
914 | 916 | ||
915 | public void Close(bool sendStop) | 917 | public void Close(bool sendStop, bool force) |
916 | { | 918 | { |
919 | // Remove ourselves from the scene | ||
920 | m_scene.RemoveClient(AgentId, false); | ||
917 | } | 921 | } |
918 | 922 | ||
919 | public void Start() | 923 | public void Start() |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 9179966..52ed846 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||
@@ -117,6 +117,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
117 | Assert.That(npc, Is.Not.Null); | 117 | Assert.That(npc, Is.Not.Null); |
118 | Assert.That(npc.Appearance.Texture.FaceTextures[8].TextureID, Is.EqualTo(originalFace8TextureId)); | 118 | Assert.That(npc.Appearance.Texture.FaceTextures[8].TextureID, Is.EqualTo(originalFace8TextureId)); |
119 | Assert.That(m_umMod.GetUserName(npc.UUID), Is.EqualTo(string.Format("{0} {1}", npc.Firstname, npc.Lastname))); | 119 | Assert.That(m_umMod.GetUserName(npc.UUID), Is.EqualTo(string.Format("{0} {1}", npc.Firstname, npc.Lastname))); |
120 | |||
121 | IClientAPI client; | ||
122 | Assert.That(m_scene.TryGetClient(npcId, out client), Is.True); | ||
123 | |||
124 | // Have to account for both SP and NPC. | ||
125 | Assert.That(m_scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(2)); | ||
120 | } | 126 | } |
121 | 127 | ||
122 | [Test] | 128 | [Test] |
@@ -136,6 +142,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
136 | ScenePresence deletedNpc = m_scene.GetScenePresence(npcId); | 142 | ScenePresence deletedNpc = m_scene.GetScenePresence(npcId); |
137 | 143 | ||
138 | Assert.That(deletedNpc, Is.Null); | 144 | Assert.That(deletedNpc, Is.Null); |
145 | IClientAPI client; | ||
146 | Assert.That(m_scene.TryGetClient(npcId, out client), Is.False); | ||
147 | |||
148 | // Have to account for SP still present. | ||
149 | Assert.That(m_scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1)); | ||
139 | } | 150 | } |
140 | 151 | ||
141 | [Test] | 152 | [Test] |