aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-31 03:33:21 +0000
committerJustin Clarke Casey2007-12-31 03:33:21 +0000
commit60fa75ac0466101654c6043d0366965da34c35bc (patch)
tree97915b0d42aba2e119025cad6f154a478fab09ca /OpenSim/Grid/UserServer
parent* Added a catch for RemotingErrors on the TCP init (diff)
downloadopensim-SC_OLD-60fa75ac0466101654c6043d0366965da34c35bc.zip
opensim-SC_OLD-60fa75ac0466101654c6043d0366965da34c35bc.tar.gz
opensim-SC_OLD-60fa75ac0466101654c6043d0366965da34c35bc.tar.bz2
opensim-SC_OLD-60fa75ac0466101654c6043d0366965da34c35bc.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs7
2 files changed, 8 insertions, 3 deletions
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;
31using System.IO; 31using System.IO;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36 37
@@ -89,7 +90,8 @@ namespace OpenSim.Grid.UserServer
89 m_userManager._config = Cfg; 90 m_userManager._config = Cfg;
90 m_userManager.AddPlugin(Cfg.DatabaseProvider); 91 m_userManager.AddPlugin(Cfg.DatabaseProvider);
91 92
92 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); 93 m_loginService = new UserLoginService(
94 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
93 95
94 MainLog.Instance.Verbose("REGION", "Starting HTTP process"); 96 MainLog.Instance.Verbose("REGION", "Starting HTTP process");
95 BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); 97 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;
32using System.Threading; 32using System.Threading;
33using libsecondlife; 33using libsecondlife;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35
35using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
37using OpenSim.Framework.Data; 39using OpenSim.Framework.Data;
38using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
@@ -45,8 +47,9 @@ namespace OpenSim.Grid.UserServer
45 { 47 {
46 public UserConfig m_config; 48 public UserConfig m_config;
47 49
48 public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess) 50 public UserLoginService(
49 : base(userManager, welcomeMess) 51 UserManagerBase userManager, LibraryRootFolder libraryRootFolder, UserConfig config, string welcomeMess)
52 : base(userManager, libraryRootFolder, welcomeMess)
50 { 53 {
51 m_config = config; 54 m_config = config;
52 } 55 }