aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorUbitUmarov2019-10-16 13:05:30 +0100
committerUbitUmarov2019-10-16 13:05:30 +0100
commitc7714d63204d70ed49e5d633bb49e34fd0f5f7cc (patch)
tree4b149d1ce8883df92e9225c47c1aaf3c1f3c936c /OpenSim/Region/ScriptEngine/Shared
parentchange OSSL functions allow control code. Behavior should stat pretty much th... (diff)
downloadopensim-SC-c7714d63204d70ed49e5d633bb49e34fd0f5f7cc.zip
opensim-SC-c7714d63204d70ed49e5d633bb49e34fd0f5f7cc.tar.gz
opensim-SC-c7714d63204d70ed49e5d633bb49e34fd0f5f7cc.tar.bz2
opensim-SC-c7714d63204d70ed49e5d633bb49e34fd0f5f7cc.tar.xz
make OSSL parsing error warning more clear
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index d1f4ae6..1f88950 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -357,6 +357,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
357 else 357 else
358 { 358 {
359 string[] ids; 359 string[] ids;
360 bool error = false;
360 if (!string.IsNullOrWhiteSpace(ownerPerm)) 361 if (!string.IsNullOrWhiteSpace(ownerPerm))
361 { 362 {
362 ids = ownerPerm.Split(new char[] {','}); 363 ids = ownerPerm.Split(new char[] {','});
@@ -403,15 +404,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
403 } 404 }
404 else 405 else
405 { 406 {
406 m_log.WarnFormat("[OSSLENABLE]: error parsing line {0}", ownerPerm); 407 error = true;
407 } 408 }
408
409 break; 409 break;
410 } 410 }
411 } 411 }
412 } 412 }
413 if (error)
414 m_log.WarnFormat("[OSSLENABLE]: error parsing line Allow_{0} = {1}", function, ownerPerm);
413 } 415 }
414 416 error = false;
415 if (!string.IsNullOrWhiteSpace(creatorPerm)) 417 if (!string.IsNullOrWhiteSpace(creatorPerm))
416 { 418 {
417 ids = creatorPerm.Split(new char[] {','}); 419 ids = creatorPerm.Split(new char[] {','});
@@ -430,9 +432,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
430 } 432 }
431 else 433 else
432 { 434 {
433 m_log.WarnFormat("[OSSLENABLE]: error parsing line {0}", creatorPerm); 435 error = true;
434 } 436 }
435 } 437 }
438 if (error)
439 m_log.WarnFormat("[OSSLENABLE]: error parsing line Creators_{0} = {1}", function, creatorPerm);
436 } 440 }
437 // both empty fallback as disabled 441 // both empty fallback as disabled
438 } 442 }