diff options
| author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
| commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
| tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |
| parent | fix pool parameters for httptests (diff) | |
| parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
| download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 2 |
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) |