aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock
diff options
context:
space:
mode:
authorSean McNamara2011-02-28 15:08:35 -0500
committerSean McNamara2011-02-28 15:08:35 -0500
commit60989521a6a60bb5610784936797df0683a55527 (patch)
tree51fd99afe41459221ff74a78be965001ff680df9 /OpenSim/Tests/Common/Mock
parentFix small bug with remove region; update settings docs. (diff)
parentFix a few little things (diff)
downloadopensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.zip
opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.tar.gz
opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.tar.bz2
opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.tar.xz
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index dc0d4de..ebe0a72 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 }