From 60fa75ac0466101654c6043d0366965da34c35bc Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 31 Dec 2007 03:33:21 +0000
Subject: Standard library folders can now be configued in the xml in
 inventory/OpenSimLibrary - no hardcoded changes are required.  For some
 reason, all the folders are currently showing up as texture folders, even
 though they are configured with the same types as the agent inventory
 folders.  This should be resolved soon.

---
 OpenSim/Grid/UserServer/Main.cs             | 4 +++-
 OpenSim/Grid/UserServer/UserLoginService.cs | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Grid/UserServer')

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 6e3ccb7..d50558f 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.IO;
 using libsecondlife;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 
@@ -89,7 +90,8 @@ namespace OpenSim.Grid.UserServer
             m_userManager._config = Cfg;
             m_userManager.AddPlugin(Cfg.DatabaseProvider);
 
-            m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
+            m_loginService = new UserLoginService(
+                 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
 
             MainLog.Instance.Verbose("REGION", "Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0eb2db1..1a3bf2e 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -32,7 +32,9 @@ using System.Collections.Generic;
 using System.Threading;
 using libsecondlife;
 using Nwc.XmlRpc;
+
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Servers;
@@ -45,8 +47,9 @@ namespace OpenSim.Grid.UserServer
     {
         public UserConfig m_config;
 
-        public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
-            : base(userManager, welcomeMess)
+        public UserLoginService(
+            UserManagerBase userManager, LibraryRootFolder libraryRootFolder, UserConfig config, string welcomeMess)
+            : base(userManager, libraryRootFolder, welcomeMess)
         {
             m_config = config;
         }
-- 
cgit v1.1