Patch #9146 (No Mantis)

Prevent an exception caused by inventory server fetch requests

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index f38a109..4e57ead 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -619,7 +619,7 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 AddRequest(
                     new InventoryRequest(
-                        Delegate.CreateDelegate(typeof(SendInventoryDescendentsDelegate), this, "SendInventoryDecendents"),
+                        Delegate.CreateDelegate(typeof(SendInventoryDescendentsDelegate), this, "SendInventoryDecendents", false, false),
                         new object[] { client, folderID, fetchFolders, fetchItems }));
 
                 return true;
@@ -670,7 +670,8 @@ namespace OpenSim.Framework.Communications.Cache
 
         public void Execute()
         {
-            m_delegate.DynamicInvoke(m_args);
+            if(m_delegate != null)
+                m_delegate.DynamicInvoke(m_args);
         }
     }
-}
\ No newline at end of file
+}