diff options
author | Justin Clark-Casey (justincc) | 2011-08-18 00:53:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-18 00:53:05 +0100 |
commit | c1a34cd8da293e63d3cba70b5271c9a297789db2 (patch) | |
tree | f6d87f42151ca8891cb37ed1bf2a5d5361c86ddf /OpenSim/Tests | |
parent | comment out noisy attachments logging (diff) | |
download | opensim-SC_OLD-c1a34cd8da293e63d3cba70b5271c9a297789db2.zip opensim-SC_OLD-c1a34cd8da293e63d3cba70b5271c9a297789db2.tar.gz opensim-SC_OLD-c1a34cd8da293e63d3cba70b5271c9a297789db2.tar.bz2 opensim-SC_OLD-c1a34cd8da293e63d3cba70b5271c9a297789db2.tar.xz |
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 8d2108c..03df7ab 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -379,7 +379,7 @@ namespace OpenSim.Tests.Common | |||
379 | 379 | ||
380 | // Stage 2: add the new client as a child agent to the scene | 380 | // Stage 2: add the new client as a child agent to the scene |
381 | TestClient client = new TestClient(agentData, scene); | 381 | TestClient client = new TestClient(agentData, scene); |
382 | scene.AddNewClient(client); | 382 | scene.AddNewClient(client, PresenceType.User); |
383 | 383 | ||
384 | // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent. | 384 | // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent. |
385 | ScenePresence scp = scene.GetScenePresence(agentData.AgentID); | 385 | ScenePresence scp = scene.GetScenePresence(agentData.AgentID); |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 7b64947..b7cefeb 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -579,7 +579,7 @@ namespace OpenSim.Tests.Common.Mock | |||
579 | 579 | ||
580 | // Stage 2: add the new client as a child agent to the scene | 580 | // Stage 2: add the new client as a child agent to the scene |
581 | TeleportSceneClient = new TestClient(newAgent, TeleportTargetScene); | 581 | TeleportSceneClient = new TestClient(newAgent, TeleportTargetScene); |
582 | TeleportTargetScene.AddNewClient(TeleportSceneClient); | 582 | TeleportTargetScene.AddNewClient(TeleportSceneClient, PresenceType.User); |
583 | } | 583 | } |
584 | 584 | ||
585 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, | 585 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, |