aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2014-12-30 20:05:12 -0800
committerDiva Canto2014-12-30 20:05:12 -0800
commita88bc50a168ae729307740fa84540e9571258b13 (patch)
tree67ed1412fd59d72aa7ef357c51c832e98e3a43db /bin
parentRenamed VERSION_NUMBER to VersionNumber (diff)
downloadopensim-SC-a88bc50a168ae729307740fa84540e9571258b13.zip
opensim-SC-a88bc50a168ae729307740fa84540e9571258b13.tar.gz
opensim-SC-a88bc50a168ae729307740fa84540e9571258b13.tar.bz2
opensim-SC-a88bc50a168ae729307740fa84540e9571258b13.tar.xz
Add support for expansion of key values in nini config files.
Add loading of 3rd-party addin inis automatically.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example10
-rw-r--r--bin/OpenSimDefaults.ini3
2 files changed, 12 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6d8c2bf..02ca13e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -95,6 +95,16 @@
95 ;; Place to create a PID file 95 ;; Place to create a PID file
96 ; PIDFile = "/tmp/OpenSim.exe.pid" 96 ; PIDFile = "/tmp/OpenSim.exe.pid"
97 97
98 ;# {RegistryLocation} {} {Addins Registry Location} {}
99 ; Set path to directory for addin registry if you want addins outside of bin.
100 ; Information about the registered repositories and installed plugins will
101 ; be stored here. The OpenSim.exe process must have R/W access to the location.
102 ; RegistryLocation = "."
103
104 ;# {Include-Addins} {} {Loads all inis of all addins} {}
105 ; Leave this as is if you want 3rd-party addins to be automatically initialized.
106 Include-Addins = "${RegistryLocation}/addins/*/*.ini"
107
98 ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem 108 ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
99 ;; Determine where OpenSimulator looks for the files which tell it 109 ;; Determine where OpenSimulator looks for the files which tell it
100 ;; which regions to server 110 ;; which regions to server
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3e9514e..73fe59c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -75,7 +75,7 @@
75 ; Set path to directory for plugin registry. Information about the 75 ; Set path to directory for plugin registry. Information about the
76 ; registered repositories and installed plugins will be stored here. 76 ; registered repositories and installed plugins will be stored here.
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 ; ## 80 ; ##
81 ; ## CLIENTS 81 ; ## CLIENTS
@@ -1877,3 +1877,4 @@
1877 1877
1878[Modules] 1878[Modules]
1879 Include-modules = "addon-modules/*/config/*.ini" 1879 Include-modules = "addon-modules/*/config/*.ini"
1880