From faea742f323db5434e735991c506cf6b9814a1a7 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 2 Jan 2015 13:32:20 -0800 Subject: [PATCH] Slight change in the way region module addins handle their configuration. Rather than opensim grabbing their config file automatically from the addins folder, it's the module's responsibility to read its own config file. This makes it consistent with Robust-bound addins. --- bin/OpenSim.ini.example | 8 +++++--- bin/OpenSimDefaults.ini | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 02ca13ef38..343f83df6c 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -101,9 +101,11 @@ ; be stored here. The OpenSim.exe process must have R/W access to the location. ; RegistryLocation = "." - ;# {Include-Addins} {} {Loads all inis of all addins} {} - ; Leave this as is if you want 3rd-party addins to be automatically initialized. - Include-Addins = "${RegistryLocation}/addins/*/*.ini" + ;# {ConfigDirectory} {} {Set path to directory for modular ini files} {} + ; Used by region module addins. You can set this to outside bin, so that addin + ; configurations will survive updates. The OpenSim.exe process must have R/W access + ; to the location. + ; ConfigDirectory = "." ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem ;; Determine where OpenSimulator looks for the files which tell it diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a1e24cfc30..20b2f0f173 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -77,6 +77,11 @@ ; The OpenSim.exe process must have R/W access to the location. RegistryLocation = "." + ; Used by region module addins. You can set this to outside bin, so that addin + ; configurations will survive updates. The OpenSim.exe process must have R/W access + ; to the location. + ConfigDirectory = "." + ; ## ; ## CLIENTS ; ##