Add support for expansion of key values in nini config files.

Add loading of 3rd-party addin inis automatically.
sedebug
Diva Canto 2014-12-30 20:05:12 -08:00
parent 2138d5c7f8
commit a88bc50a16
3 changed files with 14 additions and 1 deletions

View File

@ -325,6 +325,8 @@ namespace OpenSim
Environment.Exit(1); Environment.Exit(1);
} }
} }
configSource.Source.ExpandKeyValues();
return success; return success;
} }

View File

@ -95,6 +95,16 @@
;; Place to create a PID file ;; Place to create a PID file
; PIDFile = "/tmp/OpenSim.exe.pid" ; PIDFile = "/tmp/OpenSim.exe.pid"
;# {RegistryLocation} {} {Addins Registry Location} {}
; Set path to directory for addin registry if you want addins outside of bin.
; Information about the registered repositories and installed plugins will
; 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"
;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
;; Determine where OpenSimulator looks for the files which tell it ;; Determine where OpenSimulator looks for the files which tell it
;; which regions to server ;; which regions to server

View File

@ -75,7 +75,7 @@
; Set path to directory for plugin registry. Information about the ; Set path to directory for plugin registry. Information about the
; registered repositories and installed plugins will be stored here. ; registered repositories and installed plugins will be stored here.
; The OpenSim.exe process must have R/W access to the location. ; The OpenSim.exe process must have R/W access to the location.
; RegistryLocation = "." RegistryLocation = "."
; ## ; ##
; ## CLIENTS ; ## CLIENTS
@ -1877,3 +1877,4 @@
[Modules] [Modules]
Include-modules = "addon-modules/*/config/*.ini" Include-modules = "addon-modules/*/config/*.ini"