diff options
author | Justin Clarke Casey | 2009-01-22 19:46:31 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-22 19:46:31 +0000 |
commit | 884009ed33eab204588cc3978a46abff1098b832 (patch) | |
tree | d6a714d3c29396e0e85fecfe31788d3953662310 /OpenSim/Tests/Common/Mock | |
parent | * Remove a few unnecessary locks to try and prevent lock contention in LLImag... (diff) | |
download | opensim-SC_OLD-884009ed33eab204588cc3978a46abff1098b832.zip opensim-SC_OLD-884009ed33eab204588cc3978a46abff1098b832.tar.gz opensim-SC_OLD-884009ed33eab204588cc3978a46abff1098b832.tar.bz2 opensim-SC_OLD-884009ed33eab204588cc3978a46abff1098b832.tar.xz |
* Add some caps seed capability path checking to the simple non neighbours standalone region teleport test
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 62350b9..f899375 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -270,6 +270,11 @@ namespace OpenSim.Tests.Common.Mock | |||
270 | /// This agent's UUID | 270 | /// This agent's UUID |
271 | /// </value> | 271 | /// </value> |
272 | private UUID m_agentId; | 272 | private UUID m_agentId; |
273 | |||
274 | /// <value> | ||
275 | /// The last caps seed url that this client was given. | ||
276 | /// </value> | ||
277 | public string CapsSeedUrl; | ||
273 | 278 | ||
274 | private Vector3 startPos = new Vector3(128, 128, 2); | 279 | private Vector3 startPos = new Vector3(128, 128, 2); |
275 | 280 | ||
@@ -377,6 +382,7 @@ namespace OpenSim.Tests.Common.Mock | |||
377 | m_lastName = agentData.lastname; | 382 | m_lastName = agentData.lastname; |
378 | m_circuitCode = agentData.circuitcode; | 383 | m_circuitCode = agentData.circuitcode; |
379 | m_scene = scene; | 384 | m_scene = scene; |
385 | CapsSeedUrl = agentData.CapsPath; | ||
380 | } | 386 | } |
381 | 387 | ||
382 | /// <summary> | 388 | /// <summary> |
@@ -496,7 +502,7 @@ namespace OpenSim.Tests.Common.Mock | |||
496 | 502 | ||
497 | ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); | 503 | ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); |
498 | agentData.CapsPath = capsModule.GetCapsPath(m_agentId); | 504 | agentData.CapsPath = capsModule.GetCapsPath(m_agentId); |
499 | agentData.ChildrenCapSeeds = new Dictionary<ulong,string>(capsModule.GetChildrenSeeds(m_agentId)); | 505 | agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId)); |
500 | 506 | ||
501 | return agentData; | 507 | return agentData; |
502 | } | 508 | } |
@@ -519,6 +525,8 @@ namespace OpenSim.Tests.Common.Mock | |||
519 | { | 525 | { |
520 | m_log.DebugFormat("[TEST CLIENT]: Received SendRegionTeleport"); | 526 | m_log.DebugFormat("[TEST CLIENT]: Received SendRegionTeleport"); |
521 | 527 | ||
528 | CapsSeedUrl = capsURL; | ||
529 | |||
522 | TeleportSceneClient.CompleteMovement(); | 530 | TeleportSceneClient.CompleteMovement(); |
523 | //TeleportTargetScene.AgentCrossing(newAgent.AgentID, new Vector3(90, 90, 90), false); | 531 | //TeleportTargetScene.AgentCrossing(newAgent.AgentID, new Vector3(90, 90, 90), false); |
524 | } | 532 | } |