aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorUbitUmarov2019-10-16 13:53:55 +0100
committerUbitUmarov2019-10-16 13:53:55 +0100
commit43bf3af138f7074485c0828d47239850875cb780 (patch)
tree1037daccd4eb12f7c537476d18c0ec355aaad60d /OpenSim/Region/ScriptEngine/Shared
parentOSSL: stop reading configuration file on every script start. (diff)
downloadopensim-SC-43bf3af138f7074485c0828d47239850875cb780.zip
opensim-SC-43bf3af138f7074485c0828d47239850875cb780.tar.gz
opensim-SC-43bf3af138f7074485c0828d47239850875cb780.tar.bz2
opensim-SC-43bf3af138f7074485c0828d47239850875cb780.tar.xz
OSSL: threading issue
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e891aeb..3360b8d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -348,7 +348,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
348 if (!m_FunctionPerms.TryGetValue(function, out perms)) 348 if (!m_FunctionPerms.TryGetValue(function, out perms))
349 { 349 {
350 perms = new FunctionPerms(); 350 perms = new FunctionPerms();
351 m_FunctionPerms[function] = perms;
352 351
353 string ownerPerm = m_osslconfig.GetString("Allow_" + function, ""); 352 string ownerPerm = m_osslconfig.GetString("Allow_" + function, "");
354 string creatorPerm = m_osslconfig.GetString("Creators_" + function, ""); 353 string creatorPerm = m_osslconfig.GetString("Creators_" + function, "");
@@ -456,6 +455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
456 // both empty fallback as disabled 455 // both empty fallback as disabled
457 } 456 }
458 } 457 }
458 m_FunctionPerms.TryAdd(function,perms);
459 } 459 }
460 460
461 AllowedControlFlags functionControl = perms.AllowedControl; 461 AllowedControlFlags functionControl = perms.AllowedControl;