aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMagnuz Binder2015-05-23 13:48:37 +0200
committerMichael Cerquoni2015-05-23 08:14:28 -0400
commitabb3bb60a6ef0a3ed92d3fa54dc47d4d3e560b36 (patch)
tree19e03385172c329046708108e612bf93a4d4911c /OpenSim
parentfix permmission issue on OpenSimDefaults.ini (diff)
downloadopensim-SC_OLD-abb3bb60a6ef0a3ed92d3fa54dc47d4d3e560b36.zip
opensim-SC_OLD-abb3bb60a6ef0a3ed92d3fa54dc47d4d3e560b36.tar.gz
opensim-SC_OLD-abb3bb60a6ef0a3ed92d3fa54dc47d4d3e560b36.tar.bz2
opensim-SC_OLD-abb3bb60a6ef0a3ed92d3fa54dc47d4d3e560b36.tar.xz
Fix mesh cache race condition in llCastRay V3.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e769834..c5e02a6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -14318,7 +14318,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14318 { 14318 {
14319 lock(m_cachedMeshes) 14319 lock(m_cachedMeshes)
14320 { 14320 {
14321 m_cachedMeshes.Add(meshKey, mesh); 14321 if (!m_cachedMeshes.ContainsKey(meshKey))
14322 m_cachedMeshes.Add(meshKey, mesh);
14322 } 14323 }
14323 } 14324 }
14324 } 14325 }
@@ -14395,7 +14396,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14395 { 14396 {
14396 lock(m_cachedMeshes) 14397 lock(m_cachedMeshes)
14397 { 14398 {
14398 m_cachedMeshes.Add(meshKey, mesh); 14399 if (!m_cachedMeshes.ContainsKey(meshKey))
14400 m_cachedMeshes.Add(meshKey, mesh);
14399 } 14401 }
14400 } 14402 }
14401 } 14403 }