aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorUbitUmarov2018-10-20 16:01:26 +0100
committerUbitUmarov2018-10-20 16:01:26 +0100
commit47488c90178544ddbaa5be544c3da61ec3a1979f (patch)
treedd0cbe27171615248184e3c2029de604ed8da068 /OpenSim/Region/ScriptEngine/Shared
parentossl error messages are not from a agent (diff)
downloadopensim-SC-47488c90178544ddbaa5be544c3da61ec3a1979f.zip
opensim-SC-47488c90178544ddbaa5be544c3da61ec3a1979f.tar.gz
opensim-SC-47488c90178544ddbaa5be544c3da61ec3a1979f.tar.bz2
opensim-SC-47488c90178544ddbaa5be544c3da61ec3a1979f.tar.xz
change ossl tests setup
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs8
3 files changed, 19 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 2f9a564..7d042c6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -64,11 +64,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
64 IConfigSource initConfigSource = new IniConfigSource(); 64 IConfigSource initConfigSource = new IniConfigSource();
65 IConfig config = initConfigSource.AddConfig("XEngine"); 65 IConfig config = initConfigSource.AddConfig("XEngine");
66 config.Set("Enabled", "true"); 66 config.Set("Enabled", "true");
67 config.Set("AllowOSFunctions", "true"); 67
68 config.Set("OSFunctionThreatLevel", "Severe");
69 config = initConfigSource.AddConfig("NPC"); 68 config = initConfigSource.AddConfig("NPC");
70 config.Set("Enabled", "true"); 69 config.Set("Enabled", "true");
71 70
71 config = initConfigSource.AddConfig("OSSL");
72 config.Set("DebuggerSafe", false);
73 config.Set("AllowOSFunctions", "true");
74 config.Set("OSFunctionThreatLevel", "Severe");
75
76
72 m_scene = new SceneHelpers().SetupScene(); 77 m_scene = new SceneHelpers().SetupScene();
73 SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule()); 78 SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
74 79
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
index b6b3f12..4c7d0bb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
@@ -71,6 +71,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
71 xengineConfig.Set("AllowOSFunctions", "true"); 71 xengineConfig.Set("AllowOSFunctions", "true");
72 xengineConfig.Set("OSFunctionThreatLevel", "Severe"); 72 xengineConfig.Set("OSFunctionThreatLevel", "Severe");
73 73
74 IConfig oconfig = initConfigSource.AddConfig("OSSL");
75 oconfig.Set("DebuggerSafe", false);
76 oconfig.Set("Enabled", "true");
77 oconfig.Set("AllowOSFunctions", "true");
78 oconfig.Set("OSFunctionThreatLevel", "Severe");
79
74 IConfig modulesConfig = initConfigSource.AddConfig("Modules"); 80 IConfig modulesConfig = initConfigSource.AddConfig("Modules");
75 modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule"); 81 modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule");
76 82
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 6936191..b44cc16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -66,11 +66,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
66 IConfigSource initConfigSource = new IniConfigSource(); 66 IConfigSource initConfigSource = new IniConfigSource();
67 IConfig config = initConfigSource.AddConfig("XEngine"); 67 IConfig config = initConfigSource.AddConfig("XEngine");
68 config.Set("Enabled", "true"); 68 config.Set("Enabled", "true");
69 config.Set("AllowOSFunctions", "true"); 69
70 config.Set("OSFunctionThreatLevel", "Severe");
71 config = initConfigSource.AddConfig("NPC"); 70 config = initConfigSource.AddConfig("NPC");
72 config.Set("Enabled", "true"); 71 config.Set("Enabled", "true");
73 72
73 config = initConfigSource.AddConfig("OSSL");
74 config.Set("DebuggerSafe", false);
75 config.Set("AllowOSFunctions", "true");
76 config.Set("OSFunctionThreatLevel", "Severe");
77
74 m_scene = new SceneHelpers().SetupScene(); 78 m_scene = new SceneHelpers().SetupScene();
75 SceneHelpers.SetupSceneModules( 79 SceneHelpers.SetupSceneModules(
76 m_scene, initConfigSource, new AvatarFactoryModule(), new AttachmentsModule(), new NPCModule()); 80 m_scene, initConfigSource, new AvatarFactoryModule(), new AttachmentsModule(), new NPCModule());