ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +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);
}
}
}