From bbcb20e192b61a63e0b0462de794ccbdb54d886b Mon Sep 17 00:00:00 2001 From: gareth Date: Tue, 17 Apr 2007 01:38:20 +0000 Subject: Sim crossing now works (except for broken co-ordinates, resets to 0,0 - to be fixed soon) 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 --- OpenSim.RegionServer/SimClient.cs | 114 +++++++++++++++++++++++++++++++++++--- 1 file changed, 107 insertions(+), 7 deletions(-) (limited to 'OpenSim.RegionServer/SimClient.cs') diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index c478d92..083ca68 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs @@ -29,6 +29,7 @@ using System.Collections; using System.Collections.Generic; using libsecondlife; using libsecondlife.Packets; +using Nwc.XmlRpc; using System.Net; using System.Net.Sockets; using System.IO; @@ -58,8 +59,9 @@ namespace OpenSim public uint CircuitCode; public world.Avatar ClientAvatar; private UseCircuitCodePacket cirpack; - private Thread ClientThread; - public EndPoint userEP; + public Thread ClientThread; + public EndPoint userEP; + public LLVector3 startpos; private BlockingQueue PacketQueue; private Dictionary PendingAcks = new Dictionary(); private Dictionary NeedAck = new Dictionary(); @@ -109,6 +111,11 @@ namespace OpenSim OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request"); cirpack = initialcirpack; userEP = remoteEP; + if(m_gridServer.GetName() == "Remote") { + this.startpos=((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos; + } else { + this.startpos=new LLVector3(128.0f,128.0f,60f); + } PacketQueue = new BlockingQueue(); this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); @@ -130,6 +137,100 @@ namespace OpenSim this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate); } + public void CrossSimBorder(LLVector3 avatarpos) { // VERY VERY BASIC + LLVector3 newpos = avatarpos; + uint neighbourx=((OpenSimMain)m_application).regionData.RegionLocX; + uint neighboury=((OpenSimMain)m_application).regionData.RegionLocY; + + if(avatarpos.X<0) { + neighbourx-=1; + newpos.X=0; + } + if(avatarpos.X>255) { + neighbourx+=1; + newpos.X=255; + } + if(avatarpos.Y<0) { + neighboury-=1; + newpos.Y=0; + } + if(avatarpos.Y>255) { + neighbourx+=1; + newpos.Y=255; + } + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]"); + + Hashtable SimParams; + ArrayList SendParams; + XmlRpcRequest GridReq; + 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())) { + CrossedRegionPacket NewSimPack = new CrossedRegionPacket(); + NewSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock(); + NewSimPack.AgentData.AgentID=this.AgentID; + NewSimPack.AgentData.SessionID=this.SessionID; + NewSimPack.Info = new CrossedRegionPacket.InfoBlock(); + NewSimPack.Info.Position=newpos; + NewSimPack.Info.LookAt=new LLVector3(0.99f, 0.042f, 0); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! + NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock(); + NewSimPack.RegionData.RegionHandle=Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256)); + + System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]); + byte[] byteIP = neighbourIP.GetAddressBytes(); + NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24; + NewSimPack.RegionData.SimIP += (uint)byteIP[2] << 16; + NewSimPack.RegionData.SimIP += (uint)byteIP[1] << 8; + NewSimPack.RegionData.SimIP += (uint)byteIP[0]; + NewSimPack.RegionData.SimPort = (ushort)Convert.ToInt32(borderingSim["sim_port"]); + NewSimPack.RegionData.SeedCapability = new byte[0]; + lock(PacketQueue) { + ProcessOutPacket(NewSimPack); + DowngradeClient(); + } + } + } + } + + public void UpgradeClient() { + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - upgrading child to full agent"); + this.m_child=false; + this.m_world.RemoveViewerAgent(this); + this.InitNewClient(); + } + + public void DowngradeClient() { + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - changing full agent to child"); + this.m_child=true; + this.m_world.RemoveViewerAgent(this); + this.m_world.AddViewerAgent(this); + } + + public void KillClient() { + KillObjectPacket kill = new KillObjectPacket(); + kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; + kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); + kill.ObjectData[0].ID = this.ClientAvatar.localid; + foreach (SimClient client in m_clientThreads.Values) + { + client.OutPacket(kill); + } + if (this.m_userServer != null) + { + this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer); + } + else + { + this.m_inventoryCache.ClientLeaving(this.AgentID, null); + } + + m_world.RemoveViewerAgent(this); + + m_clientThreads.Remove(this.CircuitCode); + m_application.RemoveClientCircuit(this.CircuitCode); + this.ClientThread.Abort(); + } + public static bool AddPacketHandler(PacketType packetType, PacketMethod handler) { bool result = false; @@ -230,10 +331,9 @@ namespace OpenSim switch (Pack.Type) { case PacketType.CompleteAgentMovement: - if(!m_child) { - ClientAvatar.CompleteMovement(m_world); - ClientAvatar.SendInitialPosition(); - } + if(this.m_child) this.UpgradeClient(); + ClientAvatar.CompleteMovement(m_world); + ClientAvatar.SendInitialPosition(); break; case PacketType.RegionHandshakeReply: m_world.SendLayerData(this); @@ -797,7 +897,7 @@ namespace OpenSim } } #region Packet handlers - + protected virtual bool Logout(SimClient simClient, Packet packet) { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got a logout request"); -- cgit v1.1