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 /OpenSim/Grid/UserServer/Main.cs | |
| 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-- | OpenSim/Grid/UserServer/Main.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index f688e4c..3246757 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
| @@ -137,7 +137,7 @@ namespace OpenSim.Grid.UserServer | |||
| 137 | protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService) | 137 | protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService) |
| 138 | { | 138 | { |
| 139 | m_loginService = new UserLoginService( | 139 | m_loginService = new UserLoginService( |
| 140 | m_userManager, inventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); | 140 | m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | protected virtual void AddHttpHandlers() | 143 | protected virtual void AddHttpHandlers() |