From ef494fdf9c24387c2d98ffde5400f93fa276aa9e Mon Sep 17 00:00:00 2001 From: MW Date: Sun, 17 Jun 2007 18:04:35 +0000 Subject: Each Region will now generate a texture image of their terrain and this will be used by the map. Note: Currently each region generates a new image every time they start; even if the terrain is read from the database. And also they don't update it when the terrain changes. --- OpenSim/OpenSim.RegionServer/ClientView.API.cs | 34 +++++++++++----------- .../ClientView.PacketHandlers.cs | 4 +-- .../ClientView.ProcessPackets.cs | 27 +---------------- OpenSim/OpenSim.RegionServer/ClientView.cs | 2 -- 4 files changed, 19 insertions(+), 48 deletions(-) (limited to 'OpenSim/OpenSim.RegionServer') diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index 80719d6..bb4dccd 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs @@ -365,22 +365,22 @@ namespace OpenSim public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) { - TeleportLocalPacket tpLocal2 = new TeleportLocalPacket(); - tpLocal2.Info.AgentID = this.AgentID; - tpLocal2.Info.TeleportFlags = flags; - tpLocal2.Info.LocationID = 2; - tpLocal2.Info.LookAt = lookAt; - tpLocal2.Info.Position = position; - OutPacket(tpLocal2); + TeleportLocalPacket tpLocal = new TeleportLocalPacket(); + tpLocal.Info.AgentID = this.AgentID; + tpLocal.Info.TeleportFlags = flags; + tpLocal.Info.LocationID = 2; + tpLocal.Info.LookAt = lookAt; + tpLocal.Info.Position = position; + OutPacket(tpLocal); } public void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags) { - TeleportFinishPacket Teleport = new TeleportFinishPacket(); - Teleport.Info.AgentID = this.AgentID; - Teleport.Info.RegionHandle = regionHandle; - Teleport.Info.SimAccess = simAccess; - Teleport.Info.SeedCapability = new byte[0]; + TeleportFinishPacket teleport = new TeleportFinishPacket(); + teleport.Info.AgentID = this.AgentID; + teleport.Info.RegionHandle = regionHandle; + teleport.Info.SimAccess = simAccess; + teleport.Info.SeedCapability = new byte[0]; System.Net.IPAddress oIP = System.Net.IPAddress.Parse(ipAddress); byte[] byteIP = oIP.GetAddressBytes(); @@ -389,11 +389,11 @@ namespace OpenSim ip += (uint)byteIP[1] << 8; ip += (uint)byteIP[0]; - Teleport.Info.SimIP = ip; - Teleport.Info.SimPort = ipPort; - Teleport.Info.LocationID = 4; - Teleport.Info.TeleportFlags = 1 << 4; - OutPacket(Teleport); + teleport.Info.SimIP = ip; + teleport.Info.SimPort = ipPort; + teleport.Info.LocationID = 4; + teleport.Info.TeleportFlags = 1 << 4; + OutPacket(teleport); } /// diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs index a173c47..219cdae 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs @@ -190,9 +190,7 @@ namespace OpenSim mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]); } this.OutPacket(mbReply); - * */ - - + */ } diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs index f8425da..601fd97 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs @@ -399,7 +399,6 @@ namespace OpenSim { OnRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); } - //this.RequestMapBlocks(MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); break; case PacketType.TeleportLandmarkRequest: TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack; @@ -451,7 +450,7 @@ namespace OpenSim break; case PacketType.TeleportLocationRequest: TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; - // Console.WriteLine(tpLocReq.ToString()); + // Console.WriteLine(tpLocReq.ToString()); if (OnTeleportLocationRequest != null) { @@ -463,32 +462,8 @@ namespace OpenSim TeleportCancelPacket tpCancel = new TeleportCancelPacket(); tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID; tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID; - OutPacket(tpCancel); } - - /* if (m_regionData.RegionHandle != tpLocReq.Info.RegionHandle) - { - // m_gridServer.getRegion(tpLocReq.Info.RegionHandle); - Console.WriteLine("Inter-sim teleport not yet implemented"); - TeleportCancelPacket tpCancel = new TeleportCancelPacket(); - tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID; - tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID; - - OutPacket(tpCancel); - } - else - { - Console.WriteLine("Local teleport"); - TeleportLocalPacket tpLocal2 = new TeleportLocalPacket(); - tpLocal2.Info.AgentID = tpLocReq.AgentData.AgentID; - tpLocal2.Info.TeleportFlags = tpStart.Info.TeleportFlags; - tpLocal2.Info.LocationID = 2; - tpLocal2.Info.LookAt = tpLocReq.Info.LookAt; - tpLocal2.Info.Position = tpLocReq.Info.Position; - OutPacket(tpLocal2); - - }*/ break; #endregion diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index 74dbc1a..c5f0a1d 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs @@ -75,7 +75,6 @@ namespace OpenSim protected IWorld m_world; private Dictionary m_clientThreads; private AssetCache m_assetCache; - //private IGridServer m_gridServer; private InventoryCache m_inventoryCache; private int cachedtextureserial = 0; private RegionInfo m_regionData; @@ -95,7 +94,6 @@ namespace OpenSim cirpack = initialcirpack; userEP = remoteEP; - //this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code); this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); PacketQueue = new BlockingQueue(); -- cgit v1.1