diff options
author | Justin Clark-Casey (justincc) | 2011-09-13 22:54:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-13 22:54:50 +0100 |
commit | bd991fc95f8ec648f7dbb0086ae716e4204d1687 (patch) | |
tree | 0955cb5eafebe3f503ac5a1b16a0213ac1c4cb3f /OpenSim | |
parent | Remove code from DetachSingleAttachmentToInv() that sets group changed on all... (diff) | |
download | opensim-SC_OLD-bd991fc95f8ec648f7dbb0086ae716e4204d1687.zip opensim-SC_OLD-bd991fc95f8ec648f7dbb0086ae716e4204d1687.tar.gz opensim-SC_OLD-bd991fc95f8ec648f7dbb0086ae716e4204d1687.tar.bz2 opensim-SC_OLD-bd991fc95f8ec648f7dbb0086ae716e4204d1687.tar.xz |
Don't try and delete attachments for child agent close
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 32 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 35183b3..ff3358f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -220,6 +220,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
220 | Assert.That(m_presence.Appearance.GetAttachpoint(attItemId), Is.EqualTo(0)); | 220 | Assert.That(m_presence.Appearance.GetAttachpoint(attItemId), Is.EqualTo(0)); |
221 | } | 221 | } |
222 | 222 | ||
223 | /// <summary> | ||
224 | /// Test that attachments don't hang about in the scene when the agent is closed | ||
225 | /// </summary> | ||
226 | [Test] | ||
227 | public void TestRemoveAttachmentsOnAvatarExit() | ||
228 | { | ||
229 | TestHelpers.InMethod(); | ||
230 | // log4net.Config.XmlConfigurator.Configure(); | ||
231 | |||
232 | UUID userId = TestHelpers.ParseTail(0x1); | ||
233 | UUID attItemId = TestHelpers.ParseTail(0x2); | ||
234 | UUID attAssetId = TestHelpers.ParseTail(0x3); | ||
235 | string attName = "att"; | ||
236 | |||
237 | UserAccountHelpers.CreateUserWithInventory(scene, userId); | ||
238 | InventoryItemBase attItem | ||
239 | = UserInventoryHelpers.CreateInventoryItem( | ||
240 | scene, attName, attItemId, attAssetId, userId, InventoryType.Object); | ||
241 | |||
242 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId); | ||
243 | acd.Appearance = new AvatarAppearance(); | ||
244 | acd.Appearance.SetAttachment((int)AttachmentPoint.Chest, attItem.ID, attItem.AssetID); | ||
245 | ScenePresence presence = SceneHelpers.AddScenePresence(scene, acd); | ||
246 | |||
247 | SceneObjectGroup rezzedAtt = presence.GetAttachments()[0]; | ||
248 | |||
249 | scene.IncomingCloseAgent(presence.UUID); | ||
250 | |||
251 | // Check that we can't retrieve this attachment from the scene. | ||
252 | Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null); | ||
253 | } | ||
254 | |||
223 | [Test] | 255 | [Test] |
224 | public void TestRezAttachmentsOnAvatarEntrance() | 256 | public void TestRezAttachmentsOnAvatarEntrance() |
225 | { | 257 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 879352d..a8eff70 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3404,7 +3404,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3404 | 3404 | ||
3405 | public void Close() | 3405 | public void Close() |
3406 | { | 3406 | { |
3407 | m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false); | 3407 | if (!IsChildAgent) |
3408 | m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false); | ||
3408 | 3409 | ||
3409 | lock (m_knownChildRegions) | 3410 | lock (m_knownChildRegions) |
3410 | { | 3411 | { |