aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorlbsa712007-09-27 13:25:45 +0000
committerlbsa712007-09-27 13:25:45 +0000
commit8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch)
treeae67873a5f801b2b7bdf9a7b088db98beb97b5ac /OpenSim/Grid/UserServer
parentTerrain: (diff)
downloadopensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip
opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz
opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2
opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs11
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs39
2 files changed, 32 insertions, 18 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index c2822b6..28635dd 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -36,6 +36,8 @@ using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
38using OpenSim.Framework.Configuration; 38using OpenSim.Framework.Configuration;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.Communications.OGS1;
39 41
40namespace OpenSim.Grid.UserServer 42namespace OpenSim.Grid.UserServer
41{ 43{
@@ -48,6 +50,8 @@ namespace OpenSim.Grid.UserServer
48 public UserManager m_userManager; 50 public UserManager m_userManager;
49 public UserLoginService m_loginService; 51 public UserLoginService m_loginService;
50 52
53 public IInventoryServices m_inventoryService;
54
51 LogBase m_console; 55 LogBase m_console;
52 56
53 [STAThread] 57 [STAThread]
@@ -90,7 +94,11 @@ namespace OpenSim.Grid.UserServer
90 m_userManager._config = Cfg; 94 m_userManager._config = Cfg;
91 m_userManager.AddPlugin(Cfg.DatabaseProvider); 95 m_userManager.AddPlugin(Cfg.DatabaseProvider);
92 96
93 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); 97 // prepare connection to the inventory server
98 m_inventoryService = new OGS1InventoryService(Cfg.InventoryServerName, Cfg.InventoryServerPort, null);
99
100
101 m_loginService = new UserLoginService(m_userManager, m_inventoryService, Cfg, Cfg.DefaultStartupMsg);
94 102
95 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 103 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
96 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort); 104 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
@@ -103,6 +111,7 @@ namespace OpenSim.Grid.UserServer
103 httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); 111 httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod ));
104 112
105 httpServer.Start(); 113 httpServer.Start();
114
106 m_console.Status("SERVER", "Userserver 0.3 - Startup complete"); 115 m_console.Status("SERVER", "Userserver 0.3 - Startup complete");
107 } 116 }
108 117
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 95192e3..f0140a5 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -6,6 +6,7 @@ using OpenSim.Framework.Data;
6using OpenSim.Framework.UserManagement; 6using OpenSim.Framework.UserManagement;
7using OpenSim.Framework.Utilities; 7using OpenSim.Framework.Utilities;
8using OpenSim.Framework.Configuration; 8using OpenSim.Framework.Configuration;
9using OpenSim.Framework.Communications;
9 10
10namespace OpenSim.Grid.UserServer 11namespace OpenSim.Grid.UserServer
11{ 12{
@@ -13,8 +14,8 @@ namespace OpenSim.Grid.UserServer
13 { 14 {
14 public UserConfig m_config; 15 public UserConfig m_config;
15 16
16 public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess) 17 public UserLoginService(UserManagerBase userManager, IInventoryServices inventoryServer, UserConfig config, string welcomeMess)
17 : base(userManager, welcomeMess) 18 : base(userManager, inventoryServer, welcomeMess)
18 { 19 {
19 m_config = config; 20 m_config = config;
20 } 21 }
@@ -71,25 +72,29 @@ namespace OpenSim.Grid.UserServer
71 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 72 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
72 73
73 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); 74 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
74 // Send 75 // Send
75 try 76 try
76 { 77 {
77 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 78 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
78 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 79 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
79 } 80 }
80 catch( WebException e ) 81 catch( WebException e )
81 { 82 {
82 switch( e.Status ) 83 switch( e.Status )
83 { 84 {
84 case WebExceptionStatus.Timeout: 85 case WebExceptionStatus.Timeout:
85 //TODO: Send him to nearby or default region instead 86 //TODO: Send him to nearby or default region instead
86 break; 87 break;
87 88
88 default: 89 default:
89 throw; 90 throw;
90 } 91 }
91 } 92 }
92 } 93 }
93 } 94 }
94} 95}
95 96
97
98
99
100