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

Created skeleton SimComms.cs for sim<->sim UDP circuits

Browse Source 
Fixed bug with <0,0> co-ordinates on sim crossing
This commit is contained in:
gareth
2007-04-17 10:53:50 +00:00
parent bbcb20e192
commit 3e86870f7f
3 changed files with 476 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim.RegionServer/SimClient.cs
View File

@@ -144,19 +144,19 @@ namespace OpenSim
if(avatarpos.X<0) {
neighbourx-=1;
newpos.X=0;
newpos.X=254;
}
if(avatarpos.X>255) {
neighbourx+=1;
newpos.X=255;
newpos.X=1;
}
if(avatarpos.Y<0) {
neighboury-=1;
newpos.Y=0;
newpos.Y=254;
}
if(avatarpos.Y>255) {
neighbourx+=1;
newpos.Y=255;
newpos.Y=1;
}
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");
@@ -166,6 +166,19 @@ namespace OpenSim
XmlRpcResponse GridResp;
foreach(Hashtable borderingSim in ((RemoteGridBase)m_gridServer).neighbours) {
if(((string)borderingSim["region_locx"]).Equals(neighbourx.ToString()) && ((string)borderingSim["region_locy"]).Equals(neighboury.ToString())) {
SimParams = new Hashtable();
SimParams["firstname"] = this.ClientAvatar.firstname;
SimParams["lastname"] = this.ClientAvatar.lastname;
SimParams["circuit_code"] = this.CircuitCode.ToString();
SimParams["pos_x"] = newpos.X.ToString();
SimParams["pos_y"] = newpos.Y.ToString();
SimParams["pos_z"] = newpos.Z.ToString();
SendParams = new ArrayList();
SendParams.Add(SimParams);
GridReq = new XmlRpcRequest("agent_crossing", SendParams);
GridResp = GridReq.Send("http://" + borderingSim["sim_ip"] + ":" + borderingSim["sim_port"], 3000);
CrossedRegionPacket NewSimPack = new CrossedRegionPacket();
NewSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
NewSimPack.AgentData.AgentID=this.AgentID;
@@ -196,6 +209,8 @@ namespace OpenSim
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - upgrading child to full agent");
this.m_child=false;
this.m_world.RemoveViewerAgent(this);
this.startpos=((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].startpos;
((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].child=false;
this.InitNewClient();
}