aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorlbsa712007-09-27 14:57:43 +0000
committerlbsa712007-09-27 14:57:43 +0000
commit863195612bdef56165f2b4354bab280c371618b9 (patch)
tree63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Grid/UserServer
parentrevert change to libsecondlife.dll.config which breaks Linux (diff)
downloadopensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.zip
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.gz
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.bz2
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.xz
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
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, 18 insertions, 32 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 28635dd..c2822b6 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -36,8 +36,6 @@ 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;
41 39
42namespace OpenSim.Grid.UserServer 40namespace OpenSim.Grid.UserServer
43{ 41{
@@ -50,8 +48,6 @@ namespace OpenSim.Grid.UserServer
50 public UserManager m_userManager; 48 public UserManager m_userManager;
51 public UserLoginService m_loginService; 49 public UserLoginService m_loginService;
52 50
53 public IInventoryServices m_inventoryService;
54
55 LogBase m_console; 51 LogBase m_console;
56 52
57 [STAThread] 53 [STAThread]
@@ -94,11 +90,7 @@ namespace OpenSim.Grid.UserServer
94 m_userManager._config = Cfg; 90 m_userManager._config = Cfg;
95 m_userManager.AddPlugin(Cfg.DatabaseProvider); 91 m_userManager.AddPlugin(Cfg.DatabaseProvider);
96 92
97 // prepare connection to the inventory server 93 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
98 m_inventoryService = new OGS1InventoryService(Cfg.InventoryServerName, Cfg.InventoryServerPort, null);
99
100
101 m_loginService = new UserLoginService(m_userManager, m_inventoryService, Cfg, Cfg.DefaultStartupMsg);
102 94
103 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 95 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
104 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort); 96 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
@@ -111,7 +103,6 @@ namespace OpenSim.Grid.UserServer
111 httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); 103 httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod ));
112 104
113 httpServer.Start(); 105 httpServer.Start();
114
115 m_console.Status("SERVER", "Userserver 0.3 - Startup complete"); 106 m_console.Status("SERVER", "Userserver 0.3 - Startup complete");
116 } 107 }
117 108
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f0140a5..95192e3 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -6,7 +6,6 @@ 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;
10 9
11namespace OpenSim.Grid.UserServer 10namespace OpenSim.Grid.UserServer
12{ 11{
@@ -14,8 +13,8 @@ namespace OpenSim.Grid.UserServer
14 { 13 {
15 public UserConfig m_config; 14 public UserConfig m_config;
16 15
17 public UserLoginService(UserManagerBase userManager, IInventoryServices inventoryServer, UserConfig config, string welcomeMess) 16 public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
18 : base(userManager, inventoryServer, welcomeMess) 17 : base(userManager, welcomeMess)
19 { 18 {
20 m_config = config; 19 m_config = config;
21 } 20 }
@@ -72,29 +71,25 @@ namespace OpenSim.Grid.UserServer
72 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 71 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
73 72
74 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); 73 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
75 // Send 74 // Send
76 try 75 try
77 { 76 {
78 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 77 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
79 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 78 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
80 } 79 }
81 catch( WebException e ) 80 catch( WebException e )
82 { 81 {
83 switch( e.Status ) 82 switch( e.Status )
84 { 83 {
85 case WebExceptionStatus.Timeout: 84 case WebExceptionStatus.Timeout:
86 //TODO: Send him to nearby or default region instead 85 //TODO: Send him to nearby or default region instead
87 break; 86 break;
88 87
89 default: 88 default:
90 throw; 89 throw;
91 } 90 }
92 } 91 }
93 } 92 }
94 } 93 }
95} 94}
96 95
97
98
99
100