aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-11-23 20:26:14 +0000
committerUbitUmarov2016-11-23 20:26:14 +0000
commit72e20028d1a5c7bedfcde56429d211d8e427c7a4 (patch)
treef1d70f26ca67841ad70683db702f56011793bb61
parent add to SynchronousRestFormsRequester a keepalive disable option, and make us... (diff)
downloadopensim-SC_OLD-72e20028d1a5c7bedfcde56429d211d8e427c7a4.zip
opensim-SC_OLD-72e20028d1a5c7bedfcde56429d211d8e427c7a4.tar.gz
opensim-SC_OLD-72e20028d1a5c7bedfcde56429d211d8e427c7a4.tar.bz2
opensim-SC_OLD-72e20028d1a5c7bedfcde56429d211d8e427c7a4.tar.xz
safeguard against unknown material replacemet
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 006b730..7312bc3 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -532,7 +532,7 @@ namespace OpenSim.Region.OptionalModules.Materials
532 532
533 lock(m_Materials) 533 lock(m_Materials)
534 { 534 {
535 if(oldid != UUID.Zero) 535 if(oldid != UUID.Zero && m_MaterialsRefCount.ContainsKey(oldid))
536 { 536 {
537 m_MaterialsRefCount[oldid]--; 537 m_MaterialsRefCount[oldid]--;
538 if(m_MaterialsRefCount[oldid] <= 0) 538 if(m_MaterialsRefCount[oldid] <= 0)