From f727f26bcc26a740a1bd0585e3cdeff0c8d81a25 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 29 Jul 2009 20:32:54 +0000
Subject: * An attempt to fix mantis #3953

---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c956421..e532939 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1616,8 +1616,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             agentData.child = false;
             agentData.firstname = m_firstName;
             agentData.lastname = m_lastName;
-
+            
             ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>();
+            
+            if (capsModule == null) // can happen when shutting down.
+                return agentData;
+
             agentData.CapsPath = capsModule.GetCapsPath(m_agentId);
             agentData.ChildrenCapSeeds = new Dictionary<ulong,string>(capsModule.GetChildrenSeeds(m_agentId));
 
-- 
cgit v1.1