diff options
| author | Melanie | 2011-02-19 01:59:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-19 01:59:49 +0000 |
| commit | 4834b476798cce715d0b5b286a6f20bc577bdabd (patch) | |
| tree | 5bf15fa7978daaff116147838f84e4915bca1777 /OpenSim/Tests/Common/Mock | |
| parent | Add needed dummy to sample money (diff) | |
| parent | Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway (diff) | |
| download | opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.zip opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.gz opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.bz2 opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 147571b..7b7d66e 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -560,8 +560,11 @@ namespace OpenSim.Tests.Common.Mock | |||
| 560 | agentData.lastname = m_lastName; | 560 | agentData.lastname = m_lastName; |
| 561 | 561 | ||
| 562 | ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); | 562 | ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); |
| 563 | agentData.CapsPath = capsModule.GetCapsPath(m_agentId); | 563 | if (capsModule != null) |
| 564 | agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId)); | 564 | { |
| 565 | agentData.CapsPath = capsModule.GetCapsPath(m_agentId); | ||
| 566 | agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId)); | ||
| 567 | } | ||
| 565 | 568 | ||
| 566 | return agentData; | 569 | return agentData; |
| 567 | } | 570 | } |