aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-15 12:33:31 -0700
committerDiva Canto2013-07-15 12:33:31 -0700
commit687c1a420a6f3c254eb7104fee40a79fc6a39e1d (patch)
treeadd5c8440a66edf8a2f0bad9cfaa5a81e159ba8c
parentPuts RequestImage (UDP) back to asyn -- CPU spike hunt (diff)
downloadopensim-SC_OLD-687c1a420a6f3c254eb7104fee40a79fc6a39e1d.zip
opensim-SC_OLD-687c1a420a6f3c254eb7104fee40a79fc6a39e1d.tar.gz
opensim-SC_OLD-687c1a420a6f3c254eb7104fee40a79fc6a39e1d.tar.bz2
opensim-SC_OLD-687c1a420a6f3c254eb7104fee40a79fc6a39e1d.tar.xz
Guard against null ref
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index b90df17..5b0859b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -351,7 +351,8 @@ namespace OpenSim.Region.ClientStack.Linden
351 351
352 aPollRequest poolreq = m_queue.Dequeue(); 352 aPollRequest poolreq = m_queue.Dequeue();
353 353
354 poolreq.thepoll.Process(poolreq); 354 if (poolreq != null && poolreq.thepoll != null)
355 poolreq.thepoll.Process(poolreq);
355 } 356 }
356 } 357 }
357 } 358 }