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

Border crossing back to mostly working, still seems a problem in that you need to stop walking just after you cross the border for it to work properly (else you will continue moving into a negative position in the first sim)

Browse Source
This commit is contained in:
MW
2007-05-19 18:32:01 +00:00
parent e0b724e9aa
commit 274ce6987e
7 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim.RegionServer/AuthenticateSessionsBase.cs
View File

@@ -81,8 +81,29 @@ namespace OpenSim
this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
// Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
}
}
public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
{
if (this.AgentCircuits.ContainsKey(circuitcode))
{
this.AgentCircuits[circuitcode].child = childstatus;
}
}
public bool GetAgentChildStatus(uint circuitcode)
{
if (this.AgentCircuits.ContainsKey(circuitcode))
{
return this.AgentCircuits[circuitcode].child;
}
return false;
}
}
}

2
OpenSim.RegionServer/AuthenticateSessionsRemote.cs
View File

@@ -34,6 +34,8 @@ namespace OpenSim
{
agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
agentData.child = false;
// Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
}
this.AddNewCircuit(agentData.circuitcode, agentData);

8
OpenSim.RegionServer/SimClient.cs
View File

@@ -118,7 +118,9 @@ namespace OpenSim
if (m_gridServer.GetName() == "Remote")
{
this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
//Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
}
else
{
@@ -142,13 +144,15 @@ namespace OpenSim
# region Client Methods
public void UpgradeClient()
{
Console.WriteLine("updateclient being called");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");
this.m_child = false;
this.m_world.RemoveViewerAgent(this);
if (!this.m_sandboxMode)
{
this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].startpos;
((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].child = false;
this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
//Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
}
this.InitNewClient();
}

2
OpenSim.RegionServer/world/World.cs
View File

@@ -585,7 +585,7 @@ namespace OpenSim.world
}
if (agentClient.ClientAvatar.PhysActor != null)
{
this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);
//this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);
}
}
catch (Exception e)