From 4f25b73b572e458a3e98614fc5694286e5e3fb92 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sat, 25 Sep 2010 16:22:18 -0400 Subject: Add configurable path to script engine assemblies Adding ability to place script engine assemblies outside the codebase directories. Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies" Signed-off-by: Melanie --- bin/OpenSim.ini.example | 4 ++++ bin/OpenSimDefaults.ini | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 109e0aa..abd4d40 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -545,6 +545,10 @@ ;; false to allow script controlled underground positioning of ;; prims ; DisableUndergroundMovement = true + ; + ; Path to script engine assemblies + ; Default is ./bin/ScriptEngines + ; ScriptEnginesPath = "ScriptEngines" [MRM] ;; Enables the Mini Region Modules Script Engine. diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e78f25b..d20a91d 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -999,7 +999,10 @@ ; false to allow script controlled underground positioning of ; prims ; DisableUndergroundMovement = true - + ; + ; Path to script engine assemblies + ; Default is ./bin/ScriptEngines + ; ScriptEnginesPath = "ScriptEngines" [OpenGridProtocol] ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. -- cgit v1.1 From 51e03617e9c5f9f04ac555005bbd150187f13066 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 26 Sep 2010 02:31:37 +0100 Subject: Changes to preceding patch to make it conform to inifile formats. BLANK LINE before each comment/option group, and DOUBLE SEMICOLONS before pure text comments in OpenSim.ini.exemaple --- bin/OpenSim.ini.example | 6 +++--- bin/OpenSimDefaults.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index abd4d40..2b78014 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -545,9 +545,9 @@ ;; false to allow script controlled underground positioning of ;; prims ; DisableUndergroundMovement = true - ; - ; Path to script engine assemblies - ; Default is ./bin/ScriptEngines + + ;; Path to script engine assemblies + ;; Default is ./bin/ScriptEngines ; ScriptEnginesPath = "ScriptEngines" [MRM] diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d20a91d..355c546 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -999,7 +999,7 @@ ; false to allow script controlled underground positioning of ; prims ; DisableUndergroundMovement = true - ; + ; Path to script engine assemblies ; Default is ./bin/ScriptEngines ; ScriptEnginesPath = "ScriptEngines" -- cgit v1.1 From 8afa21cef0d138b2a85e218875b937d48edbc5d5 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sun, 26 Sep 2010 00:21:28 -0400 Subject: Some cleanup to OpenSimDefaults.ini Fixing a couple of errors --- bin/OpenSimDefaults.ini | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 355c546..26acac7 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -135,6 +135,10 @@ meshing = Meshmerizer ;meshing = ZeroMesher + + ;; Path to decoded sculpty maps + ;; Defaults to "j2kDecodeCache + ;DecodedSculpMapPath = "j2kDecodeCache" ; Choose one of the physics engines below ; OpenDynamicsEngine is by some distance the most developed physics engine @@ -999,9 +1003,14 @@ ; false to allow script controlled underground positioning of ; prims ; DisableUndergroundMovement = true +<<<<<<< HEAD:bin/OpenSimDefaults.ini ; Path to script engine assemblies ; Default is ./bin/ScriptEngines +======= + + ;; Path to script assemblies +>>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini ; ScriptEnginesPath = "ScriptEngines" [OpenGridProtocol] -- cgit v1.1 From b0b4782a2b3c7a86195ad09c1c508856c2885f4d Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sat, 25 Sep 2010 22:36:38 -0400 Subject: adding configurable j2kDecodeCache path allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache --- bin/OpenSimDefaults.ini | 6 ------ 1 file changed, 6 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 26acac7..4c579c9 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1003,14 +1003,8 @@ ; false to allow script controlled underground positioning of ; prims ; DisableUndergroundMovement = true -<<<<<<< HEAD:bin/OpenSimDefaults.ini - ; Path to script engine assemblies - ; Default is ./bin/ScriptEngines -======= - ;; Path to script assemblies ->>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini ; ScriptEnginesPath = "ScriptEngines" [OpenGridProtocol] -- cgit v1.1 From 14db53b723591642c15eb8f40290775d999d10e7 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 26 Sep 2010 18:35:15 +0100 Subject: Another typo fix --- bin/OpenSimDefaults.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 4c579c9..f939cc8 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -138,7 +138,7 @@ ;; Path to decoded sculpty maps ;; Defaults to "j2kDecodeCache - ;DecodedSculpMapPath = "j2kDecodeCache" + ;DecodedSculptMapPath = "j2kDecodeCache" ; Choose one of the physics engines below ; OpenDynamicsEngine is by some distance the most developed physics engine -- cgit v1.1