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

Sim crossing now works (except for broken co-ordinates, resets to 0,0 - to be fixed soon)

Browse Source 
Fixed sandbox mode fully
Scrapped former XML-RPC expect_user call for sim crossings
Sim client thread can upgrade/downgrade between full and child agent dynamically
This commit is contained in:
gareth
2007-04-17 01:38:20 +00:00
parent 990680027f
commit bbcb20e192
8 changed files with 159 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim.RegionServer/OpenSimMain.cs
View File

@@ -67,7 +67,7 @@ namespace OpenSim
//private Dictionary<uint, SimClient> ClientThreads = new Dictionary<uint, SimClient>();
private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
private DateTime startuptime;
private RegionInfo regionData;
public RegionInfo regionData;
public Socket Server;
private IPEndPoint ServerIncoming;
@@ -206,12 +206,19 @@ namespace OpenSim
agent_data.firstname = (string)requestData["firstname"];
agent_data.lastname = (string)requestData["lastname"];
agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);
agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
{
agent_data.child = true;
}
((RemoteGridBase)gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
if(requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) {
agent_data.child=true;
} else {
agent_data.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]),Convert.ToUInt32(requestData["startpos_y"]),Convert.ToUInt32(requestData["startpos_z"]));
agent_data.child=false;
}
if(((RemoteGridBase)gridServer).agentcircuits.ContainsKey((uint)agent_data.circuitcode)) {
((RemoteGridBase)gridServer).agentcircuits[(uint)agent_data.circuitcode]=agent_data;
} else {
((RemoteGridBase)gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
}
return new XmlRpcResponse();
});
@@ -286,7 +293,7 @@ namespace OpenSim
pluginAssembly = null;
return config;
}
private void OnReceivedData(IAsyncResult result)
{
ipeSender = new IPEndPoint(IPAddress.Any, 0);