diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 10 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
4 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index b19e549..6e7bd1c 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -325,6 +325,8 @@ namespace OpenSim | |||
325 | Environment.Exit(1); | 325 | Environment.Exit(1); |
326 | } | 326 | } |
327 | } | 327 | } |
328 | |||
329 | configSource.Source.ExpandKeyValues(); | ||
328 | return success; | 330 | return success; |
329 | } | 331 | } |
330 | 332 | ||
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs index 69f13bf..650425b 100644 --- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs | |||
@@ -33,4 +33,4 @@ using Mono.Addins; | |||
33 | [assembly: AssemblyVersion("0.8.1.*")] | 33 | [assembly: AssemblyVersion("0.8.1.*")] |
34 | 34 | ||
35 | [assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VersionNumber)] | 35 | [assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VersionNumber)] |
36 | [assembly: ImportAddinAssembly("Opensim.Framework.dll")] | 36 | [assembly: ImportAddinAssembly("OpenSim.Framework.dll")] |
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 212baab..a1e24cf 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 |
@@ -1884,3 +1884,4 @@ | |||
1884 | 1884 | ||
1885 | [Modules] | 1885 | [Modules] |
1886 | Include-modules = "addon-modules/*/config/*.ini" | 1886 | Include-modules = "addon-modules/*/config/*.ini" |
1887 | |||