diff options
author | Justin Clarke Casey | 2008-12-29 16:56:48 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-29 16:56:48 +0000 |
commit | 266d0fbaaeac0dad06da98ceda8d19b8f3d732d6 (patch) | |
tree | 45f2ad93db485b5144c3fc86662891432c3a877a /bin | |
parent | Revamp the return logic to close a privilege escalation loophole. (diff) | |
download | opensim-SC-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.zip opensim-SC-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.gz opensim-SC-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.bz2 opensim-SC-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=2927 with some changes
* This allows configuration of the assetset and library control file paths to be other than ./inventory/Libraries.xml and ./assets/AssetSets.xml
* This is controlled via the LibrariesXMLFile and AssetSetsXMLFile configuration settings in [StandAlone] in OpenSim.ini (in standalone)
and via the user and asset config xml files for grid mode
* Thanks to SirKimba for the patch
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bd48f8c..cc117ad 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -178,7 +178,7 @@ | |||
178 | 178 | ||
179 | ;WorldMapModule = "WorldMap" | 179 | ;WorldMapModule = "WorldMap" |
180 | ;MapImageModule = "MapImageModule" | 180 | ;MapImageModule = "MapImageModule" |
181 | 181 | ||
182 | 182 | ||
183 | [StandAlone] | 183 | [StandAlone] |
184 | accounts_authenticate = true | 184 | accounts_authenticate = true |
@@ -225,6 +225,14 @@ | |||
225 | ; User Source MySQL example | 225 | ; User Source MySQL example |
226 | ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" | 226 | ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" |
227 | 227 | ||
228 | ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute | ||
229 | ; Default is ./inventory/Libraries.xml | ||
230 | ;LibrariesXMLFile="./inventory/Libraries.xml" | ||
231 | |||
232 | ; Specifies the location and filename of the inventory library assets control file. The path can be relative or absolute | ||
233 | ; Setting is optional. Default is ./assets/AssetSets.xml | ||
234 | ;AssetSetsXMLFile="./assets/AssetSets.xml" | ||
235 | |||
228 | dump_assets_to_file = false | 236 | dump_assets_to_file = false |
229 | 237 | ||
230 | 238 | ||