ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Reverting todays work. It was worth a try.

Browse Source
This commit is contained in:
lbsa71
2007-03-27 20:45:04 +00:00
parent 64aa87765b
commit 7adbe756fb
46 changed files with 676 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
View File

@@ -12,15 +12,11 @@ namespace OpenSim.UserServer
{
class LocalUserProfileManager : UserProfileManager
{
private IGridServer m_gridServer;
private int m_port;
private string m_ipAddr;
private IGridServer _gridServer;
public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr)
public LocalUserProfileManager(IGridServer gridServer)
{
m_gridServer = gridServer;
m_port = simPort;
m_ipAddr = ipAddr;
_gridServer = gridServer;
}
public override void InitUserProfiles()
@@ -33,8 +29,8 @@ namespace OpenSim.UserServer
uint circode = (uint)response["circuit_code"];
theUser.AddSimCircuit(circode, LLUUID.Random());
response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}";
response["sim_port"] = m_port;
response["sim_ip"] = m_ipAddr;
response["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort;
response["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr;
response["region_y"] = (Int32)996 * 256;
response["region_x"] = (Int32)997* 256;
@@ -71,9 +67,9 @@ namespace OpenSim.UserServer
_login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]);
//working on local computer if so lets add to the gridserver's list of sessions?
if (m_gridServer.GetName() == "Local")
if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local")
{
((LocalGridBase)this.m_gridServer).AddNewSession(_login);
((LocalGridBase)this._gridServer).AddNewSession(_login);
}
}
}

20
OpenSim.RegionServer/UserServer/LoginServer.cs
View File

@@ -52,7 +52,7 @@ namespace OpenSim.UserServer
/// </summary>
public class LoginServer : LoginService , IUserServer
{
private IGridServer m_gridServer;
private IGridServer _gridServer;
private ushort _loginPort = 8080;
public IPAddress clientAddress = IPAddress.Loopback;
public IPAddress remoteAddress = IPAddress.Any;
@@ -63,14 +63,10 @@ namespace OpenSim.UserServer
private string _mpasswd;
private bool _needPasswd = false;
private LocalUserProfileManager userManager;
private int m_simPort;
private string m_simAddr;
public LoginServer(IGridServer gridServer, string simAddr, int simPort)
public LoginServer(IGridServer gridServer)
{
m_gridServer = gridServer;
m_simPort = simPort;
m_simAddr = simAddr;
_gridServer = gridServer;
}
// InitializeLogin: initialize the login
@@ -93,7 +89,7 @@ namespace OpenSim.UserServer
SR.Close();
this._mpasswd = EncodePassword("testpass");
userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr );
userManager = new LocalUserProfileManager(this._gridServer);
userManager.InitUserProfiles();
userManager.SetKeys("", "", "", "Welcome to OpenSim");
@@ -293,8 +289,8 @@ namespace OpenSim.UserServer
XmlRpcResponse response = (XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse);
Hashtable responseData = (Hashtable)response.Value;
responseData["sim_port"] = m_simPort;
responseData["sim_ip"] = m_simAddr;
responseData["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort;
responseData["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr;
responseData["agent_id"] = Agent.ToStringHyphenated();
responseData["session_id"] = Session.ToStringHyphenated();
responseData["secure_session_id"]= secureSess.ToStringHyphenated();
@@ -331,9 +327,9 @@ namespace OpenSim.UserServer
_login.InventoryFolder = InventoryFolderID;
//working on local computer if so lets add to the gridserver's list of sessions?
if (m_gridServer.GetName() == "Local")
if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local")
{
((LocalGridBase)m_gridServer).AddNewSession(_login);
((LocalGridBase)this._gridServer).AddNewSession(_login);
}
// forward the XML-RPC response to the client