aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/UserServer/LoginServer.cs
diff options
context:
space:
mode:
authorlbsa712007-03-27 20:45:04 +0000
committerlbsa712007-03-27 20:45:04 +0000
commit7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8 (patch)
treed8dc563b7fef4ce9dcc34fbcc31c3fcc7d99d49f /OpenSim.RegionServer/UserServer/LoginServer.cs
parent* Config should be loaded before login server startup... (diff)
downloadopensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.zip
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.gz
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.bz2
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.xz
* Reverting todays work. It was worth a try.
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/UserServer/LoginServer.cs20
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim.RegionServer/UserServer/LoginServer.cs b/OpenSim.RegionServer/UserServer/LoginServer.cs
index 47af8a8..86b098a 100644
--- a/OpenSim.RegionServer/UserServer/LoginServer.cs
+++ b/OpenSim.RegionServer/UserServer/LoginServer.cs
@@ -52,7 +52,7 @@ namespace OpenSim.UserServer
52 /// </summary> 52 /// </summary>
53 public class LoginServer : LoginService , IUserServer 53 public class LoginServer : LoginService , IUserServer
54 { 54 {
55 private IGridServer m_gridServer; 55 private IGridServer _gridServer;
56 private ushort _loginPort = 8080; 56 private ushort _loginPort = 8080;
57 public IPAddress clientAddress = IPAddress.Loopback; 57 public IPAddress clientAddress = IPAddress.Loopback;
58 public IPAddress remoteAddress = IPAddress.Any; 58 public IPAddress remoteAddress = IPAddress.Any;
@@ -63,14 +63,10 @@ namespace OpenSim.UserServer
63 private string _mpasswd; 63 private string _mpasswd;
64 private bool _needPasswd = false; 64 private bool _needPasswd = false;
65 private LocalUserProfileManager userManager; 65 private LocalUserProfileManager userManager;
66 private int m_simPort;
67 private string m_simAddr;
68 66
69 public LoginServer(IGridServer gridServer, string simAddr, int simPort) 67 public LoginServer(IGridServer gridServer)
70 { 68 {
71 m_gridServer = gridServer; 69 _gridServer = gridServer;
72 m_simPort = simPort;
73 m_simAddr = simAddr;
74 } 70 }
75 71
76 // InitializeLogin: initialize the login 72 // InitializeLogin: initialize the login
@@ -93,7 +89,7 @@ namespace OpenSim.UserServer
93 SR.Close(); 89 SR.Close();
94 this._mpasswd = EncodePassword("testpass"); 90 this._mpasswd = EncodePassword("testpass");
95 91
96 userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr ); 92 userManager = new LocalUserProfileManager(this._gridServer);
97 userManager.InitUserProfiles(); 93 userManager.InitUserProfiles();
98 userManager.SetKeys("", "", "", "Welcome to OpenSim"); 94 userManager.SetKeys("", "", "", "Welcome to OpenSim");
99 95
@@ -293,8 +289,8 @@ namespace OpenSim.UserServer
293 XmlRpcResponse response = (XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse); 289 XmlRpcResponse response = (XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse);
294 Hashtable responseData = (Hashtable)response.Value; 290 Hashtable responseData = (Hashtable)response.Value;
295 291
296 responseData["sim_port"] = m_simPort; 292 responseData["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort;
297 responseData["sim_ip"] = m_simAddr; 293 responseData["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr;
298 responseData["agent_id"] = Agent.ToStringHyphenated(); 294 responseData["agent_id"] = Agent.ToStringHyphenated();
299 responseData["session_id"] = Session.ToStringHyphenated(); 295 responseData["session_id"] = Session.ToStringHyphenated();
300 responseData["secure_session_id"]= secureSess.ToStringHyphenated(); 296 responseData["secure_session_id"]= secureSess.ToStringHyphenated();
@@ -331,9 +327,9 @@ namespace OpenSim.UserServer
331 _login.InventoryFolder = InventoryFolderID; 327 _login.InventoryFolder = InventoryFolderID;
332 328
333 //working on local computer if so lets add to the gridserver's list of sessions? 329 //working on local computer if so lets add to the gridserver's list of sessions?
334 if (m_gridServer.GetName() == "Local") 330 if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local")
335 { 331 {
336 ((LocalGridBase)m_gridServer).AddNewSession(_login); 332 ((LocalGridBase)this._gridServer).AddNewSession(_login);
337 } 333 }
338 334
339 // forward the XML-RPC response to the client 335 // forward the XML-RPC response to the client