aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2015-01-02 13:32:20 -0800
committerDiva Canto2015-01-02 13:32:20 -0800
commitfaea742f323db5434e735991c506cf6b9814a1a7 (patch)
tree61f00c1213b714ceb41364eefc7e101ae19494e0 /bin
parentAnother minor improvement to mautil related to https://github.com/mono/mono-a... (diff)
downloadopensim-SC-faea742f323db5434e735991c506cf6b9814a1a7.zip
opensim-SC-faea742f323db5434e735991c506cf6b9814a1a7.tar.gz
opensim-SC-faea742f323db5434e735991c506cf6b9814a1a7.tar.bz2
opensim-SC-faea742f323db5434e735991c506cf6b9814a1a7.tar.xz
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.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example8
-rw-r--r--bin/OpenSimDefaults.ini5
2 files changed, 10 insertions, 3 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 02ca13e..343f83d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -101,9 +101,11 @@
101 ; be stored here. The OpenSim.exe process must have R/W access to the location. 101 ; be stored here. The OpenSim.exe process must have R/W access to the location.
102 ; RegistryLocation = "." 102 ; RegistryLocation = "."
103 103
104 ;# {Include-Addins} {} {Loads all inis of all addins} {} 104 ;# {ConfigDirectory} {} {Set path to directory for modular ini files} {}
105 ; Leave this as is if you want 3rd-party addins to be automatically initialized. 105 ; Used by region module addins. You can set this to outside bin, so that addin
106 Include-Addins = "${RegistryLocation}/addins/*/*.ini" 106 ; configurations will survive updates. The OpenSim.exe process must have R/W access
107 ; to the location.
108 ; ConfigDirectory = "."
107 109
108 ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem 110 ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
109 ;; Determine where OpenSimulator looks for the files which tell it 111 ;; Determine where OpenSimulator looks for the files which tell it
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a1e24cf..20b2f0f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -77,6 +77,11 @@
77 ; The OpenSim.exe process must have R/W access to the location. 77 ; The OpenSim.exe process must have R/W access to the location.
78 RegistryLocation = "." 78 RegistryLocation = "."
79 79
80 ; Used by region module addins. You can set this to outside bin, so that addin
81 ; configurations will survive updates. The OpenSim.exe process must have R/W access
82 ; to the location.
83 ConfigDirectory = "."
84
80 ; ## 85 ; ##
81 ; ## CLIENTS 86 ; ## CLIENTS
82 ; ## 87 ; ##