aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-12 18:26:25 +0000
committerMelanie Thielker2008-07-12 18:26:25 +0000
commit4ff529bdaf50b84ee477212de95260c7b7b0867f (patch)
treee840776209163cee3da0cf124a634619524fb186
parentMantis#1726. Thank you kindly, StrawberryFride for a patch that: (diff)
downloadopensim-SC_OLD-4ff529bdaf50b84ee477212de95260c7b7b0867f.zip
opensim-SC_OLD-4ff529bdaf50b84ee477212de95260c7b7b0867f.tar.gz
opensim-SC_OLD-4ff529bdaf50b84ee477212de95260c7b7b0867f.tar.bz2
opensim-SC_OLD-4ff529bdaf50b84ee477212de95260c7b7b0867f.tar.xz
Patch #9146 (No Mantis)
Prevent an exception caused by inventory server fetch requests
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs7
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
619 { 619 {
620 AddRequest( 620 AddRequest(
621 new InventoryRequest( 621 new InventoryRequest(
622 Delegate.CreateDelegate(typeof(SendInventoryDescendentsDelegate), this, "SendInventoryDecendents"), 622 Delegate.CreateDelegate(typeof(SendInventoryDescendentsDelegate), this, "SendInventoryDecendents", false, false),
623 new object[] { client, folderID, fetchFolders, fetchItems })); 623 new object[] { client, folderID, fetchFolders, fetchItems }));
624 624
625 return true; 625 return true;
@@ -670,7 +670,8 @@ namespace OpenSim.Framework.Communications.Cache
670 670
671 public void Execute() 671 public void Execute()
672 { 672 {
673 m_delegate.DynamicInvoke(m_args); 673 if(m_delegate != null)
674 m_delegate.DynamicInvoke(m_args);
674 } 675 }
675 } 676 }
676} \ No newline at end of file 677}