From d8f232c8b05a7f1954737c5f43be9da04a9844dd Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 12 Jun 2007 18:11:14 +0000
Subject:
---
OpenSim/OpenSim.RegionServer/ClientView.API.cs | 682 +++++++++++++++++++++
.../ClientView.AgentAssetUpload.cs | 263 ++++++++
.../ClientView.PacketHandlers.cs | 222 +++++++
.../ClientView.ProcessPackets.cs | 538 ++++++++++++++++
OpenSim/OpenSim.RegionServer/ClientView.cs | 293 +++++++++
.../ClientView/ClientView.API.cs | 682 ---------------------
.../ClientView/ClientView.AgentAssetUpload.cs | 263 --------
.../ClientView/ClientView.PacketHandlers.cs | 222 -------
.../ClientView/ClientView.ProcessPackets.cs | 538 ----------------
.../OpenSim.RegionServer/ClientView/ClientView.cs | 293 ---------
.../ClientView/ClientViewBase.cs | 327 ----------
OpenSim/OpenSim.RegionServer/ClientViewBase.cs | 327 ++++++++++
.../OpenSim.RegionServer.csproj | 28 +-
.../OpenSim.RegionServer.dll.build | 12 +-
14 files changed, 2345 insertions(+), 2345 deletions(-)
create mode 100644 OpenSim/OpenSim.RegionServer/ClientView.API.cs
create mode 100644 OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
create mode 100644 OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
create mode 100644 OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
create mode 100644 OpenSim/OpenSim.RegionServer/ClientView.cs
delete mode 100644 OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs
delete mode 100644 OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs
delete mode 100644 OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
delete mode 100644 OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
delete mode 100644 OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs
delete mode 100644 OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs
create mode 100644 OpenSim/OpenSim.RegionServer/ClientViewBase.cs
(limited to 'OpenSim/OpenSim.RegionServer')
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
new file mode 100644
index 0000000..b9773c6
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -0,0 +1,682 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim
+{
+ partial class ClientView
+ {
+ public event ChatFromViewer OnChatFromViewer;
+ public event RezObject OnRezObject;
+ public event GenericCall4 OnDeRezObject;
+ public event ModifyTerrain OnModifyTerrain;
+ public event GenericCall OnRegionHandShakeReply;
+ public event GenericCall OnRequestWearables;
+ public event SetAppearance OnSetAppearance;
+ public event GenericCall2 OnCompleteMovementToRegion;
+ public event GenericCall3 OnAgentUpdate;
+ public event StartAnim OnStartAnim;
+ public event GenericCall OnRequestAvatarsData;
+ public event LinkObjects OnLinkObjects;
+ public event GenericCall4 OnAddPrim;
+ public event UpdateShape OnUpdatePrimShape;
+ public event ObjectSelect OnObjectSelect;
+ public event UpdatePrimFlags OnUpdatePrimFlags;
+ public event UpdatePrimTexture OnUpdatePrimTexture;
+ public event UpdatePrimVector OnUpdatePrimPosition;
+ public event UpdatePrimRotation OnUpdatePrimRotation;
+ public event UpdatePrimVector OnUpdatePrimScale;
+ public event StatusChange OnChildAgentStatus;
+ public event GenericCall2 OnStopMovement;
+ public event NewAvatar OnNewAvatar;
+ public event GenericCall6 OnRemoveAvatar;
+
+ public event ParcelPropertiesRequest OnParcelPropertiesRequest;
+ public event ParcelDivideRequest OnParcelDivideRequest;
+ public event ParcelJoinRequest OnParcelJoinRequest;
+ public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+
+ public event EstateOwnerMessageRequest OnEstateOwnerMessage;
+
+ ///
+ ///
+ ///
+ public LLVector3 StartPos
+ {
+ get
+ {
+ return startpos;
+ }
+ set
+ {
+ startpos = value;
+ }
+ }
+
+ ///
+ ///
+ ///
+ public LLUUID AgentId
+ {
+ get
+ {
+ return this.AgentID;
+ }
+ }
+
+ ///
+ ///
+ ///
+ public string FirstName
+ {
+ get
+ {
+ return this.firstName;
+ }
+
+ }
+
+ ///
+ ///
+ ///
+ public string LastName
+ {
+ get
+ {
+ return this.lastName;
+ }
+ }
+
+ #region World/Avatar to Client
+
+ ///
+ ///
+ ///
+ ///
+ public void SendRegionHandshake(RegionInfo regionInfo)
+ {
+ System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ RegionHandshakePacket handshake = new RegionHandshakePacket();
+
+ handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
+ handshake.RegionInfo.IsEstateManager = false;
+ handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;
+ handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;
+ handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;
+ handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;
+ handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;
+ handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;
+ handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;
+ handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;
+ handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;
+ handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;
+
+
+ handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;
+
+ handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.estateSettings.waterHeight + "\0");
+ handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;
+ handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;
+ handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;
+ handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;
+ handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;
+ handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;
+ handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;
+ handshake.RegionInfo.TerrainDetail2 =regionInfo.estateSettings.terrainDetail2;
+ handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;
+ handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
+
+ this.OutPacket(handshake);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void MoveAgentIntoRegion(RegionInfo regInfo)
+ {
+ AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
+ mov.AgentData.SessionID = this.SessionID;
+ mov.AgentData.AgentID = this.AgentID;
+ mov.Data.RegionHandle = regInfo.RegionHandle;
+ // TODO - dynamicalise this stuff
+ mov.Data.Timestamp = 1172750370;
+ mov.Data.Position = this.startpos;
+ mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
+
+ OutPacket(mov);
+ }
+
+ public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+ {
+ SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+ {
+ System.Text.Encoding enc = System.Text.Encoding.ASCII;
+ libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
+ reply.ChatData.Audible = 1;
+ reply.ChatData.Message = message;
+ reply.ChatData.ChatType = type;
+ reply.ChatData.SourceType = 1;
+ reply.ChatData.Position = fromPos;
+ reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
+ reply.ChatData.OwnerID = fromAgentID;
+ reply.ChatData.SourceID = fromAgentID;
+
+ this.OutPacket(reply);
+ }
+
+
+ ///
+ /// Send the region heightmap to the client
+ ///
+ /// heightmap
+ public virtual void SendLayerData(float[] map)
+ {
+ try
+ {
+ int[] patches = new int[4];
+
+ for (int y = 0; y < 16; y++)
+ {
+ for (int x = 0; x < 16; x = x + 4)
+ {
+ patches[0] = x + 0 + y * 16;
+ patches[1] = x + 1 + y * 16;
+ patches[2] = x + 2 + y * 16;
+ patches[3] = x + 3 + y * 16;
+
+ Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
+ OutPacket(layerpack);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
+ }
+ }
+
+ ///
+ /// Sends a specified patch to a client
+ ///
+ /// Patch coordinate (x) 0..16
+ /// Patch coordinate (y) 0..16
+ /// heightmap
+ public void SendLayerData(int px, int py, float[] map)
+ {
+ try
+ {
+ int[] patches = new int[1];
+ int patchx, patchy;
+ patchx = px / 16;
+ patchy = py / 16;
+
+ patches[0] = patchx + 0 + patchy * 16;
+
+ Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
+ OutPacket(layerpack);
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
+ }
+ }
+
+ public void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)
+ {
+ EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
+ enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
+ enablesimpacket.SimulatorInfo.Handle = neighbourHandle;
+
+ byte[] byteIP = neighbourIP.GetAddressBytes();
+ enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
+ enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
+ enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
+ enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
+ enablesimpacket.SimulatorInfo.Port = neighbourPort;
+ OutPacket(enablesimpacket);
+ }
+
+ public AgentCircuitData RequestClientInfo()
+ {
+ AgentCircuitData agentData = new AgentCircuitData();
+ agentData.AgentID = this.AgentId;
+ agentData.SessionID = this.SessionID;
+ agentData.SecureSessionID = this.SecureSessionID;
+ agentData.circuitcode = this.CircuitCode;
+ agentData.child = false;
+ agentData.firstname = this.firstName;
+ agentData.lastname = this.lastName;
+
+ return agentData;
+ }
+
+ #region Appearance/ Wearables Methods
+
+ ///
+ ///
+ ///
+ ///
+ public void SendWearables(AvatarWearable[] wearables)
+ {
+ AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
+ aw.AgentData.AgentID = this.AgentID;
+ aw.AgentData.SerialNum = 0;
+ aw.AgentData.SessionID = this.SessionID;
+
+ aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
+ AgentWearablesUpdatePacket.WearableDataBlock awb;
+ for (int i = 0; i < wearables.Length; i++)
+ {
+ awb = new AgentWearablesUpdatePacket.WearableDataBlock();
+ awb.WearableType = (byte)i;
+ awb.AssetID = wearables[i].AssetID;
+ awb.ItemID = wearables[i].ItemID;
+ aw.WearableData[i] = awb;
+ }
+
+ this.OutPacket(aw);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry)
+ {
+ AvatarAppearancePacket avp = new AvatarAppearancePacket();
+ avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+ avp.ObjectData.TextureEntry = textureEntry;
+
+ AvatarAppearancePacket.VisualParamBlock avblock = null;
+ for (int i = 0; i < visualParams.Length; i++)
+ {
+ avblock = new AvatarAppearancePacket.VisualParamBlock();
+ avblock.ParamValue = visualParams[i];
+ avp.VisualParam[i] = avblock;
+ }
+
+ avp.Sender.IsTrial = false;
+ avp.Sender.ID = agentID;
+ OutPacket(avp);
+ }
+
+ #endregion
+
+ #region Avatar Packet/data sending Methods
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)
+ {
+ System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ //send a objectupdate packet with information about the clients avatar
+
+ ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
+ objupdate.RegionData.RegionHandle = regionInfo.RegionHandle;
+ objupdate.RegionData.TimeDilation = 64096;
+ objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
+ objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket();
+ //give this avatar object a local id and assign the user a name
+
+ objupdate.ObjectData[0].ID = avatarLocalID;
+ objupdate.ObjectData[0].FullID = avatarID;
+ objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0");
+ libsecondlife.LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
+ byte[] pb = pos2.GetBytes();
+ Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
+
+ OutPacket(objupdate);
+
+ }
+
+
+ ///
+ ///
+ ///
+ ///
+ protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata)
+ {
+ objdata.PSBlock = new byte[0];
+ objdata.ExtraParams = new byte[1];
+ objdata.MediaURL = new byte[0];
+ objdata.NameValue = new byte[0];
+ objdata.Text = new byte[0];
+ objdata.TextColor = new byte[4];
+ objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+ objdata.JointPivot = new LLVector3(0, 0, 0);
+ objdata.Material = 4;
+ objdata.TextureAnim = new byte[0];
+ objdata.Sound = LLUUID.Zero;
+ LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+ objdata.TextureEntry = ntex.ToBytes();
+ objdata.State = 0;
+ objdata.Data = new byte[0];
+
+ objdata.ObjectData = new byte[76];
+ objdata.ObjectData[15] = 128;
+ objdata.ObjectData[16] = 63;
+ objdata.ObjectData[56] = 128;
+ objdata.ObjectData[61] = 102;
+ objdata.ObjectData[62] = 40;
+ objdata.ObjectData[63] = 61;
+ objdata.ObjectData[64] = 189;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket()
+ {
+ libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+
+ SetDefaultAvatarPacketValues(ref objdata);
+ objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
+ objdata.PathCurve = 16;
+ objdata.ProfileCurve = 1;
+ objdata.PathScaleX = 100;
+ objdata.PathScaleY = 100;
+ objdata.ParentID = 0;
+ objdata.OwnerID = LLUUID.Zero;
+ objdata.Scale = new LLVector3(1, 1, 1);
+ objdata.PCode = 47;
+ System.Text.Encoding enc = System.Text.Encoding.ASCII;
+ libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
+ pos.X = 100f;
+ objdata.ID = 8880000;
+ objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
+ libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
+ //objdata.FullID=user.AgentID;
+ byte[] pb = pos.GetBytes();
+ Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
+
+ return objdata;
+ }
+
+ #endregion
+
+ #region Primitive Packet/data Sending Methods
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
+ {
+ ObjectAttachPacket attach = new ObjectAttachPacket();
+ attach.AgentData.AgentID = this.AgentID;
+ attach.AgentData.SessionID = this.SessionID;
+ attach.AgentData.AttachmentPoint = attachPoint;
+ attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
+ attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
+ attach.ObjectData[0].ObjectLocalID = localID;
+ attach.ObjectData[0].Rotation = rotation;
+
+ this.OutPacket(attach);
+ }
+
+ ///
+ /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
+ /// or big changes to a existing primitive.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID)
+ {
+ ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+ outPacket.RegionData.RegionHandle = regionHandle;
+ outPacket.RegionData.TimeDilation = timeDilation;
+ outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+ outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID);
+ outPacket.ObjectData[0].ID = localID;
+ outPacket.ObjectData[0].FullID = primData.FullID;
+ byte[] pb = pos.GetBytes();
+ Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+ byte[] rot = rotation.GetBytes();
+ Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 48, rot.Length);
+ OutPacket(outPacket);
+ }
+
+ ///
+ /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
+ /// or big changes to a existing primitive.
+ /// uses default rotation
+ ///
+ ///
+ ///
+ public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID)
+ {
+ ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+ outPacket.RegionData.RegionHandle = regionHandle;
+ outPacket.RegionData.TimeDilation = timeDilation;
+ outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+ outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID);
+ outPacket.ObjectData[0].ID = localID;
+ outPacket.ObjectData[0].FullID = primData.FullID;
+ byte[] pb = pos.GetBytes();
+ Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+
+ OutPacket(outPacket);
+ }
+
+ ///
+ /// Create the ObjectDataBlock for a ObjectUpdatePacket (for a Primitive)
+ ///
+ ///
+ ///
+ protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID)
+ {
+ ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+ this.SetDefaultPrimPacketValues(objupdate);
+ objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
+ this.SetPrimPacketShapeData(objupdate, primData, textureID);
+
+ return objupdate;
+ }
+
+ ///
+ /// Set some default values in a ObjectUpdatePacket
+ ///
+ ///
+ protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
+ {
+ objdata.PSBlock = new byte[0];
+ objdata.ExtraParams = new byte[1];
+ objdata.MediaURL = new byte[0];
+ objdata.NameValue = new byte[0];
+ objdata.Text = new byte[0];
+ objdata.TextColor = new byte[4];
+ objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+ objdata.JointPivot = new LLVector3(0, 0, 0);
+ objdata.Material = 3;
+ objdata.TextureAnim = new byte[0];
+ objdata.Sound = LLUUID.Zero;
+ objdata.State = 0;
+ objdata.Data = new byte[0];
+
+ objdata.ObjectData = new byte[60];
+ objdata.ObjectData[46] = 128;
+ objdata.ObjectData[47] = 63;
+ }
+
+ ///
+ /// Copy the data from a PrimData object to a ObjectUpdatePacket
+ ///
+ ///
+ ///
+ protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimData primData, LLUUID textureID)
+ {
+ LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
+ objectData.TextureEntry = ntex.ToBytes();
+ objectData.OwnerID = primData.OwnerID;
+ objectData.PCode = primData.PCode;
+ objectData.PathBegin =primData.PathBegin;
+ objectData.PathEnd = primData.PathEnd;
+ objectData.PathScaleX = primData.PathScaleX;
+ objectData.PathScaleY = primData.PathScaleY;
+ objectData.PathShearX = primData.PathShearX;
+ objectData.PathShearY = primData.PathShearY;
+ objectData.PathSkew = primData.PathSkew;
+ objectData.ProfileBegin = primData.ProfileBegin;
+ objectData.ProfileEnd = primData.ProfileEnd;
+ objectData.Scale = primData.Scale;
+ objectData.PathCurve = primData.PathCurve;
+ objectData.ProfileCurve = primData.ProfileCurve;
+ objectData.ParentID = primData.ParentID;
+ objectData.ProfileHollow = primData.ProfileHollow;
+ objectData.PathRadiusOffset = primData.PathRadiusOffset;
+ objectData.PathRevolutions = primData.PathRevolutions;
+ objectData.PathTaperX = primData.PathTaperX;
+ objectData.PathTaperY = primData.PathTaperY;
+ objectData.PathTwist = primData.PathTwist;
+ objectData.PathTwistBegin = primData.PathTwistBegin;
+ }
+
+ public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation)
+ {
+ ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
+ terse.RegionData.RegionHandle = regionHandle;
+ terse.RegionData.TimeDilation = timeDilation;
+ terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+ terse.ObjectData[0] = this.CreatePrimImprovedBlock(localID, position, rotation);
+
+ this.OutPacket(terse);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreatePrimImprovedBlock(uint localID, LLVector3 position, LLQuaternion rotation)
+ {
+ uint ID = localID;
+ byte[] bytes = new byte[60];
+
+ int i = 0;
+ ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+ dat.TextureEntry = new byte[0];
+ bytes[i++] = (byte)(ID % 256);
+ bytes[i++] = (byte)((ID >> 8) % 256);
+ bytes[i++] = (byte)((ID >> 16) % 256);
+ bytes[i++] = (byte)((ID >> 24) % 256);
+ bytes[i++] = 0;
+ bytes[i++] = 0;
+
+ byte[] pb = position.GetBytes();
+ Array.Copy(pb, 0, bytes, i, pb.Length);
+ i += 12;
+ ushort ac = 32767;
+
+ //vel
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+
+ //accel
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+
+ ushort rw, rx, ry, rz;
+ rw = (ushort)(32768 * (rotation.W + 1));
+ rx = (ushort)(32768 * (rotation.X + 1));
+ ry = (ushort)(32768 * (rotation.Y + 1));
+ rz = (ushort)(32768 * (rotation.Z + 1));
+
+ //rot
+ bytes[i++] = (byte)(rx % 256);
+ bytes[i++] = (byte)((rx >> 8) % 256);
+ bytes[i++] = (byte)(ry % 256);
+ bytes[i++] = (byte)((ry >> 8) % 256);
+ bytes[i++] = (byte)(rz % 256);
+ bytes[i++] = (byte)((rz >> 8) % 256);
+ bytes[i++] = (byte)(rw % 256);
+ bytes[i++] = (byte)((rw >> 8) % 256);
+
+ //rotation vel
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 8) % 256);
+
+ dat.Data = bytes;
+ return dat;
+ }
+ #endregion
+
+ #endregion
+
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
new file mode 100644
index 0000000..31749d8
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
@@ -0,0 +1,263 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Assets;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+using OpenSim.Caches;
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim
+{
+ partial class ClientView
+ {
+ public class AgentAssetUpload
+ {
+ private Dictionary transactions = new Dictionary();
+ private ClientView ourClient;
+ private AssetCache m_assetCache;
+ private InventoryCache m_inventoryCache;
+
+ public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)
+ {
+ this.ourClient = client;
+ m_assetCache = assetCache;
+ m_inventoryCache = inventoryCache;
+ }
+
+ public void AddUpload(LLUUID transactionID, AssetBase asset)
+ {
+ AssetTransaction upload = new AssetTransaction();
+ lock (this.transactions)
+ {
+ upload.Asset = asset;
+ upload.TransactionID = transactionID;
+ this.transactions.Add(transactionID, upload);
+ }
+ if (upload.Asset.Data.Length > 2)
+ {
+ //is complete
+ upload.UploadComplete = true;
+ AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+ response.AssetBlock.Type = asset.Type;
+ response.AssetBlock.Success = true;
+ response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
+ this.ourClient.OutPacket(response);
+ m_assetCache.AddAsset(asset);
+ }
+ else
+ {
+ upload.UploadComplete = false;
+ upload.XferID = Util.GetNextXferID();
+ RequestXferPacket xfer = new RequestXferPacket();
+ xfer.XferID.ID = upload.XferID;
+ xfer.XferID.VFileType = upload.Asset.Type;
+ xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);
+ xfer.XferID.FilePath = 0;
+ xfer.XferID.Filename = new byte[0];
+ this.ourClient.OutPacket(xfer);
+ }
+
+ }
+
+ public AssetBase GetUpload(LLUUID transactionID)
+ {
+ if (this.transactions.ContainsKey(transactionID))
+ {
+ return this.transactions[transactionID].Asset;
+ }
+
+ return null;
+ }
+
+ public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
+ {
+ // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
+ AssetBase asset = null;
+ if (pack.AssetBlock.Type == 0)
+ {
+
+ //first packet for transaction
+ asset = new AssetBase();
+ asset.FullID = assetID;
+ asset.Type = pack.AssetBlock.Type;
+ asset.InvType = asset.Type;
+ asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+ asset.Data = pack.AssetBlock.AssetData;
+
+
+ }
+ else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)
+ {
+
+ asset = new AssetBase();
+ asset.FullID = assetID;
+ // Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
+ asset.Type = pack.AssetBlock.Type;
+ asset.InvType = asset.Type;
+ asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
+ asset.Data = pack.AssetBlock.AssetData;
+
+
+ }
+
+ if (asset != null)
+ {
+ this.AddUpload(pack.AssetBlock.TransactionID, asset);
+ }
+ else
+ {
+
+ //currently we don't support this asset type
+ //so lets just tell the client that the upload is complete
+ AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+ response.AssetBlock.Type = pack.AssetBlock.Type;
+ response.AssetBlock.Success = true;
+ response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);
+ this.ourClient.OutPacket(response);
+ }
+
+ }
+
+ #region Xfer packet system for larger uploads
+
+ public void HandleXferPacket(SendXferPacketPacket xferPacket)
+ {
+ lock (this.transactions)
+ {
+ foreach (AssetTransaction trans in this.transactions.Values)
+ {
+ if (trans.XferID == xferPacket.XferID.ID)
+ {
+ if (trans.Asset.Data.Length > 1)
+ {
+ byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];
+ Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);
+ Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);
+ trans.Asset.Data = newArray;
+ }
+ else
+ {
+ byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];
+ Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);
+ trans.Asset.Data = newArray;
+ }
+
+ if ((xferPacket.XferID.Packet & 2147483648) != 0)
+ {
+ //end of transfer
+ trans.UploadComplete = true;
+ AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+ response.AssetBlock.Type = trans.Asset.Type;
+ response.AssetBlock.Success = true;
+ response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
+ this.ourClient.OutPacket(response);
+
+ m_assetCache.AddAsset(trans.Asset);
+ //check if we should add it to inventory
+ if (trans.AddToInventory)
+ {
+ // m_assetCache.AddAsset(trans.Asset);
+ m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
+ }
+
+
+ }
+ break;
+ }
+
+ }
+ }
+
+ ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
+ confirmXfer.XferID.ID = xferPacket.XferID.ID;
+ confirmXfer.XferID.Packet = xferPacket.XferID.Packet;
+ this.ourClient.OutPacket(confirmXfer);
+ }
+
+ #endregion
+
+ public AssetBase AddUploadToAssetCache(LLUUID transactionID)
+ {
+ AssetBase asset = null;
+ if (this.transactions.ContainsKey(transactionID))
+ {
+ AssetTransaction trans = this.transactions[transactionID];
+ if (trans.UploadComplete)
+ {
+ m_assetCache.AddAsset(trans.Asset);
+ asset = trans.Asset;
+ }
+ }
+
+ return asset;
+ }
+
+ public void CreateInventoryItem(CreateInventoryItemPacket packet)
+ {
+ if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
+ {
+ AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
+ trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
+ trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
+ trans.Asset.Type = packet.InventoryBlock.Type;
+ trans.Asset.InvType = packet.InventoryBlock.InvType;
+ if (trans.UploadComplete)
+ {
+ //already complete so we can add it to the inventory
+ //m_assetCache.AddAsset(trans.Asset);
+ m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
+ }
+ else
+ {
+ trans.AddToInventory = true;
+ trans.InventFolder = packet.InventoryBlock.FolderID;
+ }
+ }
+ }
+
+ private class AssetTransaction
+ {
+ public uint XferID;
+ public AssetBase Asset;
+ public bool AddToInventory;
+ public LLUUID InventFolder = LLUUID.Zero;
+ public bool UploadComplete = false;
+ public LLUUID TransactionID = LLUUID.Zero;
+
+ public AssetTransaction()
+ {
+
+ }
+ }
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
new file mode 100644
index 0000000..035eb4c
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -0,0 +1,222 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+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;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Assets;
+
+namespace OpenSim
+{
+ public partial class ClientView
+ {
+ protected virtual void RegisterLocalPacketHandlers()
+ {
+ this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);
+ this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);
+ this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);
+ }
+
+ protected virtual bool Logout(ClientView simClient, Packet packet)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
+ //send reply to let the client logout
+ LogoutReplyPacket logReply = new LogoutReplyPacket();
+ logReply.AgentData.AgentID = this.AgentID;
+ logReply.AgentData.SessionID = this.SessionID;
+ logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
+ logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
+ logReply.InventoryData[0].ItemID = LLUUID.Zero;
+ OutPacket(logReply);
+ //tell all clients to kill our object
+ KillObjectPacket kill = new KillObjectPacket();
+ kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
+ kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
+ // kill.ObjectData[0].ID = this.ClientAvatar.localid;
+ foreach (ClientView client in m_clientThreads.Values)
+ {
+ client.OutPacket(kill);
+ }
+
+ this.m_inventoryCache.ClientLeaving(this.AgentID, null);
+
+
+ // m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
+ /*lock (m_world.Entities)
+ {
+ m_world.Entities.Remove(this.AgentID);
+ }*/
+ // m_world.RemoveViewerAgent(this);
+ //need to do other cleaning up here too
+ m_clientThreads.Remove(this.CircuitCode);
+ m_networkServer.RemoveClientCircuit(this.CircuitCode);
+ this.ClientThread.Abort();
+ return true;
+ }
+
+ protected bool AgentTextureCached(ClientView simclient, Packet packet)
+ {
+ // Console.WriteLine(packet.ToString());
+ AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
+ AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
+ cachedresp.AgentData.AgentID = this.AgentID;
+ cachedresp.AgentData.SessionID = this.SessionID;
+ cachedresp.AgentData.SerialNum = this.cachedtextureserial;
+ this.cachedtextureserial++;
+ cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
+ for (int i = 0; i < chechedtex.WearableData.Length; i++)
+ {
+ cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+ cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
+ cachedresp.WearableData[i].TextureID = LLUUID.Zero;
+ cachedresp.WearableData[i].HostName = new byte[0];
+ }
+ this.OutPacket(cachedresp);
+ return true;
+ }
+
+ protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
+ {
+ MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
+ for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
+ {
+ if (multipleupdate.ObjectData[i].Type == 9) //change position
+ {
+ if (OnUpdatePrimPosition != null)
+ {
+ libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+ }
+ //should update stored position of the prim
+ }
+ else if (multipleupdate.ObjectData[i].Type == 10)//rotation
+ {
+ if (OnUpdatePrimRotation != null)
+ {
+ libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+ OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+ }
+ }
+ else if (multipleupdate.ObjectData[i].Type == 13)//scale
+ {
+ if (OnUpdatePrimScale != null)
+ {
+ libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+ OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+ }
+ }
+ }
+ return true;
+ }
+
+ public void RequestMapLayer() //should be getting the map layer from the grid server
+ {
+ //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
+ MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
+ mapReply.AgentData.AgentID = this.AgentID;
+ mapReply.AgentData.Flags = 0;
+ mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
+ mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
+ mapReply.LayerData[0].Bottom = 800;
+ mapReply.LayerData[0].Left = 800;
+ mapReply.LayerData[0].Top = 1200;
+ mapReply.LayerData[0].Right = 1200;
+ mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+ this.OutPacket(mapReply);
+ }
+
+ public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
+ {
+ IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
+ MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
+ mbReply.AgentData.AgentID = this.AgentID;
+ int len;
+ if (simMapProfiles == null)
+ len = 0;
+ else
+ len = simMapProfiles.Count;
+
+ mbReply.Data = new MapBlockReplyPacket.DataBlock[len];
+ int iii;
+ for (iii = 0; iii < len; iii++)
+ {
+ Hashtable mp = (Hashtable)simMapProfiles[iii];
+ mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
+ mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
+ mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
+ mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
+ mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
+ mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
+ mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);
+ mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
+ mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
+ }
+ this.OutPacket(mbReply);
+ }
+
+ protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)
+ {
+ PrimData PData = new PrimData();
+ PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+ PData.PCode = addPacket.ObjectData.PCode;
+ PData.PathBegin = addPacket.ObjectData.PathBegin;
+ PData.PathEnd = addPacket.ObjectData.PathEnd;
+ PData.PathScaleX = addPacket.ObjectData.PathScaleX;
+ PData.PathScaleY = addPacket.ObjectData.PathScaleY;
+ PData.PathShearX = addPacket.ObjectData.PathShearX;
+ PData.PathShearY = addPacket.ObjectData.PathShearY;
+ PData.PathSkew = addPacket.ObjectData.PathSkew;
+ PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+ PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+ PData.Scale = addPacket.ObjectData.Scale;
+ PData.PathCurve = addPacket.ObjectData.PathCurve;
+ PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+ PData.ParentID = 0;
+ PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+ PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+ PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+ PData.PathTaperX = addPacket.ObjectData.PathTaperX;
+ PData.PathTaperY = addPacket.ObjectData.PathTaperY;
+ PData.PathTwist = addPacket.ObjectData.PathTwist;
+ PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+
+ return PData;
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
new file mode 100644
index 0000000..c6749a1
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -0,0 +1,538 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+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;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Assets;
+
+namespace OpenSim
+{
+ public partial class ClientView
+ {
+ protected override void ProcessInPacket(Packet Pack)
+ {
+ ack_pack(Pack);
+ if (debug)
+ {
+ if (Pack.Type != PacketType.AgentUpdate)
+ {
+ Console.WriteLine(Pack.Type.ToString());
+ }
+ }
+
+ if (this.ProcessPacketMethod(Pack))
+ {
+ //there is a handler registered that handled this packet type
+ return;
+ }
+ else
+ {
+ System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+
+ switch (Pack.Type)
+ {
+ case PacketType.ViewerEffect:
+ ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
+ foreach (ClientView client in m_clientThreads.Values)
+ {
+ if (client.AgentID != this.AgentID)
+ {
+ viewer.AgentData.AgentID = client.AgentID;
+ viewer.AgentData.SessionID = client.SessionID;
+ client.OutPacket(viewer);
+ }
+ }
+ break;
+
+ #region World/Avatar
+ case PacketType.ChatFromViewer:
+ ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
+ if (Util.FieldToString(inchatpack.ChatData.Message) == "")
+ {
+ //empty message so don't bother with it
+ break;
+ }
+ string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
+ byte[] message = inchatpack.ChatData.Message;
+ byte type = inchatpack.ChatData.Type;
+ LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
+ LLUUID fromAgentID = AgentID;
+ if (OnChatFromViewer != null)
+ {
+ this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
+ }
+ break;
+ case PacketType.RezObject:
+ RezObjectPacket rezPacket = (RezObjectPacket)Pack;
+ AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
+ if (inven != null)
+ {
+ if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
+ {
+ AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
+ if (asset != null)
+ {
+ if (OnRezObject != null)
+ {
+ this.OnRezObject(asset, rezPacket.RezData.RayEnd);
+ this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);
+ }
+ }
+ }
+ }
+ break;
+ case PacketType.DeRezObject:
+ if (OnDeRezObject != null)
+ {
+ OnDeRezObject(Pack, this);
+ }
+ break;
+ case PacketType.ModifyLand:
+ ModifyLandPacket modify = (ModifyLandPacket)Pack;
+ if (modify.ParcelData.Length > 0)
+ {
+ if (OnModifyTerrain != null)
+ {
+ OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
+ }
+ }
+ break;
+ case PacketType.RegionHandshakeReply:
+ if (OnRegionHandShakeReply != null)
+ {
+ OnRegionHandShakeReply(this);
+ }
+ break;
+ case PacketType.AgentWearablesRequest:
+ if (OnRequestWearables != null)
+ {
+ OnRequestWearables(this);
+ }
+ if (OnRequestAvatarsData != null)
+ {
+ OnRequestAvatarsData(this);
+ }
+ break;
+ case PacketType.AgentSetAppearance:
+ AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
+ if (OnSetAppearance != null)
+ {
+ OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
+ }
+ break;
+ case PacketType.CompleteAgentMovement:
+ if (this.m_child) this.UpgradeClient();
+ if (OnCompleteMovementToRegion != null)
+ {
+ OnCompleteMovementToRegion();
+ }
+ // this.EnableNeighbours();
+ break;
+ case PacketType.AgentUpdate:
+ if (OnAgentUpdate != null)
+ {
+ OnAgentUpdate(Pack);
+ }
+ break;
+ case PacketType.AgentAnimation:
+ if (!m_child)
+ {
+ AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
+ for (int i = 0; i < AgentAni.AnimationList.Length; i++)
+ {
+ if (AgentAni.AnimationList[i].StartAnim)
+ {
+ if (OnStartAnim != null)
+ {
+ OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
+ }
+ }
+ }
+ }
+ break;
+
+ #endregion
+
+ #region Objects/Prims
+ case PacketType.ObjectLink:
+ // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
+ ObjectLinkPacket link = (ObjectLinkPacket)Pack;
+ uint parentprimid = 0;
+ List childrenprims = new List();
+ if (link.ObjectData.Length > 1)
+ {
+ parentprimid = link.ObjectData[0].ObjectLocalID;
+
+ for (int i = 1; i < link.ObjectData.Length; i++)
+ {
+ childrenprims.Add(link.ObjectData[i].ObjectLocalID);
+ }
+ }
+ if (OnLinkObjects != null)
+ {
+ OnLinkObjects(parentprimid, childrenprims);
+ }
+ break;
+ case PacketType.ObjectAdd:
+ // m_world.AddNewPrim((ObjectAddPacket)Pack, this);
+ if (OnAddPrim != null)
+ {
+ OnAddPrim(Pack, this);
+ }
+ break;
+ case PacketType.ObjectShape:
+ ObjectShapePacket shape = (ObjectShapePacket)Pack;
+ for (int i = 0; i < shape.ObjectData.Length; i++)
+ {
+ if (OnUpdatePrimShape != null)
+ {
+ OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);
+ }
+ }
+ break;
+ case PacketType.ObjectSelect:
+ ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
+ for (int i = 0; i < incomingselect.ObjectData.Length; i++)
+ {
+ if (OnObjectSelect != null)
+ {
+ OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
+ }
+ }
+ break;
+ case PacketType.ObjectFlagUpdate:
+ ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
+ if (OnUpdatePrimFlags != null)
+ {
+ OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
+ }
+ break;
+ case PacketType.ObjectImage:
+ ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
+ for (int i = 0; i < imagePack.ObjectData.Length; i++)
+ {
+ if (OnUpdatePrimTexture != null)
+ {
+ OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
+ }
+ }
+ break;
+ #endregion
+
+ #region Inventory/Asset/Other related packets
+ case PacketType.RequestImage:
+ RequestImagePacket imageRequest = (RequestImagePacket)Pack;
+ for (int i = 0; i < imageRequest.RequestImage.Length; i++)
+ {
+ m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
+ }
+ break;
+ case PacketType.TransferRequest:
+ //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
+ TransferRequestPacket transfer = (TransferRequestPacket)Pack;
+ m_assetCache.AddAssetRequest(this, transfer);
+ break;
+ case PacketType.AssetUploadRequest:
+ AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
+ this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
+ break;
+ case PacketType.RequestXfer:
+ //Console.WriteLine(Pack.ToString());
+ break;
+ case PacketType.SendXferPacket:
+ this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
+ break;
+ case PacketType.CreateInventoryFolder:
+ CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
+ m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
+ //Console.WriteLine(Pack.ToString());
+ break;
+ case PacketType.CreateInventoryItem:
+ //Console.WriteLine(Pack.ToString());
+ CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
+ if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
+ {
+ this.UploadAssets.CreateInventoryItem(createItem);
+ }
+ else
+ {
+ // Console.Write(Pack.ToString());
+ this.CreateInventoryItem(createItem);
+ }
+ break;
+ case PacketType.FetchInventory:
+ //Console.WriteLine("fetch item packet");
+ FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
+ m_inventoryCache.FetchInventory(this, FetchInventory);
+ break;
+ case PacketType.FetchInventoryDescendents:
+ FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
+ m_inventoryCache.FetchInventoryDescendents(this, Fetch);
+ break;
+ case PacketType.UpdateInventoryItem:
+ UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
+ //Console.WriteLine(Pack.ToString());
+ for (int i = 0; i < update.InventoryData.Length; i++)
+ {
+ if (update.InventoryData[i].TransactionID != LLUUID.Zero)
+ {
+ AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
+ if (asset != null)
+ {
+ // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
+ m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+ }
+ else
+ {
+ asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
+ if (asset != null)
+ {
+ //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
+ m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+ }
+ else
+ {
+ //Console.WriteLine("trying to update inventory item, but asset is null");
+ }
+ }
+ }
+ else
+ {
+ m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
+ }
+ }
+ break;
+ case PacketType.RequestTaskInventory:
+ // Console.WriteLine(Pack.ToString());
+ RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
+ ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
+ bool foundent = false;
+ /* foreach (Entity ent in m_world.Entities.Values)
+ {
+ if (ent.localid == requesttask.InventoryData.LocalID)
+ {
+ replytask.InventoryData.TaskID = ent.uuid;
+ replytask.InventoryData.Serial = 0;
+ replytask.InventoryData.Filename = new byte[0];
+ foundent = true;
+ }
+ }
+ if (foundent)
+ {
+ this.OutPacket(replytask);
+ }*/
+ break;
+ case PacketType.UpdateTaskInventory:
+ // Console.WriteLine(Pack.ToString());
+ UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
+ AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
+ /*if (myinventory != null)
+ {
+ if (updatetask.UpdateData.Key == 0)
+ {
+ if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
+ {
+ if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
+ {
+ LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
+ AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
+ if (assBase != null)
+ {
+ foreach (Entity ent in m_world.Entities.Values)
+ {
+ if (ent.localid == updatetask.UpdateData.LocalID)
+ {
+ if (ent is OpenSim.world.Primitive)
+ {
+ this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }*/
+ break;
+ case PacketType.MapLayerRequest:
+ this.RequestMapLayer();
+ break;
+ case PacketType.MapBlockRequest:
+ MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;
+
+ this.RequestMapBlocks(MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
+ break;
+ case PacketType.TeleportLandmarkRequest:
+ TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
+
+ TeleportStartPacket tpStart = new TeleportStartPacket();
+ tpStart.Info.TeleportFlags = 8; // tp via lm
+ this.OutPacket(tpStart);
+
+ TeleportProgressPacket tpProgress = new TeleportProgressPacket();
+ tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
+ tpProgress.Info.TeleportFlags = 8;
+ tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
+ this.OutPacket(tpProgress);
+
+ // Fetch landmark
+ LLUUID lmid = tpReq.Info.LandmarkID;
+ AssetBase lma = this.m_assetCache.GetAsset(lmid);
+ if (lma != null)
+ {
+ AssetLandmark lm = new AssetLandmark(lma);
+
+ if (lm.RegionID == m_regionData.SimUUID)
+ {
+ TeleportLocalPacket tpLocal = new TeleportLocalPacket();
+
+ tpLocal.Info.AgentID = tpReq.Info.AgentID;
+ tpLocal.Info.TeleportFlags = 8; // Teleport via landmark
+ tpLocal.Info.LocationID = 2;
+ tpLocal.Info.Position = lm.Position;
+ OutPacket(tpLocal);
+ }
+ else
+ {
+ TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+ tpCancel.Info.AgentID = tpReq.Info.AgentID;
+ tpCancel.Info.SessionID = tpReq.Info.SessionID;
+ OutPacket(tpCancel);
+ }
+ }
+ else
+ {
+ Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");
+
+ TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+ tpCancel.Info.AgentID = tpReq.Info.AgentID;
+ tpCancel.Info.SessionID = tpReq.Info.SessionID;
+ OutPacket(tpCancel);
+ }
+ break;
+ case PacketType.TeleportLocationRequest:
+ TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
+ Console.WriteLine(tpLocReq.ToString());
+
+ tpStart = new TeleportStartPacket();
+ tpStart.Info.TeleportFlags = 16; // Teleport via location
+ Console.WriteLine(tpStart.ToString());
+ OutPacket(tpStart);
+
+ 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 tpLocal = new TeleportLocalPacket();
+ tpLocal.Info.AgentID = tpLocReq.AgentData.AgentID;
+ tpLocal.Info.TeleportFlags = tpStart.Info.TeleportFlags;
+ tpLocal.Info.LocationID = 2;
+ tpLocal.Info.LookAt = tpLocReq.Info.LookAt;
+ tpLocal.Info.Position = tpLocReq.Info.Position;
+ OutPacket(tpLocal);
+
+ }
+ break;
+ #endregion
+
+ #region Parcel related packets
+ case PacketType.ParcelPropertiesRequest:
+ ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
+ if(OnParcelPropertiesRequest != null)
+ {
+ OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this);
+ }
+ break;
+ case PacketType.ParcelDivide:
+ ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
+ if (OnParcelDivideRequest != null)
+ {
+ OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
+ }
+ break;
+ case PacketType.ParcelJoin:
+ ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
+ if (OnParcelJoinRequest != null)
+ {
+ OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
+ }
+ break;
+ case PacketType.ParcelPropertiesUpdate:
+ ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
+ if (OnParcelPropertiesUpdateRequest != null)
+ {
+ OnParcelPropertiesUpdateRequest(updatePacket, this);
+ }
+ break;
+ #endregion
+
+ #region Estate Packets
+ case PacketType.EstateOwnerMessage:
+ EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
+ if (OnEstateOwnerMessage != null)
+ {
+ OnEstateOwnerMessage(messagePacket, this);
+ }
+ break;
+ #endregion
+
+ #region unimplemented handlers
+ case PacketType.AgentIsNowWearing:
+ // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
+ //Console.WriteLine(Pack.ToString());
+ break;
+ case PacketType.ObjectScale:
+ //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
+ break;
+ #endregion
+ }
+ }
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
new file mode 100644
index 0000000..e9c1f2d
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -0,0 +1,293 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+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;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Assets;
+using OpenSim.Caches;
+
+namespace OpenSim
+{
+ public delegate bool PacketMethod(ClientView simClient, Packet packet);
+
+ ///
+ /// Handles new client connections
+ /// Constructor takes a single Packet and authenticates everything
+ ///
+ public partial class ClientView : ClientViewBase, IClientAPI
+ {
+ public static TerrainManager TerrainManager;
+
+ protected static Dictionary PacketHandlers = new Dictionary(); //Global/static handlers for all clients
+ protected Dictionary m_packetHandlers = new Dictionary(); //local handlers for this instance
+
+ public LLUUID AgentID;
+ public LLUUID SessionID;
+ public LLUUID SecureSessionID = LLUUID.Zero;
+ public string firstName;
+ public string lastName;
+ public bool m_child = false;
+ private UseCircuitCodePacket cirpack;
+ public Thread ClientThread;
+ public LLVector3 startpos;
+
+ private AgentAssetUpload UploadAssets;
+ private LLUUID newAssetFolder = LLUUID.Zero;
+ private bool debug = false;
+ 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;
+ protected AuthenticateSessionsBase m_authenticateSessionsHandler;
+
+ public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
+ {
+ m_world = world;
+ m_clientThreads = clientThreads;
+ m_assetCache = assetCache;
+
+ m_networkServer = packServer;
+ m_inventoryCache = inventoryCache;
+ m_authenticateSessionsHandler = authenSessions;
+
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
+ cirpack = initialcirpack;
+ userEP = remoteEP;
+
+ this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
+ this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
+
+ PacketQueue = new BlockingQueue();
+
+ this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
+ AckTimer = new System.Timers.Timer(500);
+ AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
+ AckTimer.Start();
+
+ this.RegisterLocalPacketHandlers();
+
+ ClientThread = new Thread(new ThreadStart(AuthUser));
+ ClientThread.IsBackground = true;
+ ClientThread.Start();
+ }
+
+ # region Client Methods
+ public void UpgradeClient()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");
+ this.m_child = false;
+ this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
+ m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
+ OnChildAgentStatus(this.m_child);
+ }
+
+ public void DowngradeClient()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child");
+ this.m_child = true;
+ OnChildAgentStatus(this.m_child);
+
+ }
+
+ 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 (ClientView client in m_clientThreads.Values)
+ {
+ client.OutPacket(kill);
+ }
+
+ this.m_inventoryCache.ClientLeaving(this.AgentID, null);
+
+
+ // m_world.RemoveViewerAgent(this);
+
+ m_clientThreads.Remove(this.CircuitCode);
+ m_networkServer.RemoveClientCircuit(this.CircuitCode);
+ this.ClientThread.Abort();
+ }
+ #endregion
+
+ # region Packet Handling
+ public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)
+ {
+ bool result = false;
+ lock (PacketHandlers)
+ {
+ if (!PacketHandlers.ContainsKey(packetType))
+ {
+ PacketHandlers.Add(packetType, handler);
+ result = true;
+ }
+ }
+ return result;
+ }
+
+ public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)
+ {
+ bool result = false;
+ lock (m_packetHandlers)
+ {
+ if (!m_packetHandlers.ContainsKey(packetType))
+ {
+ m_packetHandlers.Add(packetType, handler);
+ result = true;
+ }
+ }
+ return result;
+ }
+
+ protected virtual bool ProcessPacketMethod(Packet packet)
+ {
+ bool result = false;
+ bool found = false;
+ PacketMethod method;
+ if (m_packetHandlers.TryGetValue(packet.Type, out method))
+ {
+ //there is a local handler for this packet type
+ result = method(this, packet);
+ }
+ else
+ {
+ //there is not a local handler so see if there is a Global handler
+ lock (PacketHandlers)
+ {
+ found = PacketHandlers.TryGetValue(packet.Type, out method);
+ }
+ if (found)
+ {
+ result = method(this, packet);
+ }
+ }
+ return result;
+ }
+
+ protected virtual void ClientLoop()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop");
+ while (true)
+ {
+ QueItem nextPacket = PacketQueue.Dequeue();
+ if (nextPacket.Incoming)
+ {
+ //is a incoming packet
+ ProcessInPacket(nextPacket.Packet);
+ }
+ else
+ {
+ //is a out going packet
+ ProcessOutPacket(nextPacket.Packet);
+ }
+ }
+ }
+ # endregion
+
+ # region Setup
+
+ protected virtual void InitNewClient()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
+ this.m_world.AddNewAvatar(this, this.AgentID, false);
+ }
+
+ protected virtual void AuthUser()
+ {
+ // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
+ AuthenticateResponse sessionInfo = this.m_authenticateSessionsHandler.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
+ if (!sessionInfo.Authorised)
+ {
+ //session/circuit not authorised
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+ ClientThread.Abort();
+ }
+ else
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
+ //session is authorised
+ this.AgentID = cirpack.CircuitCode.ID;
+ this.SessionID = cirpack.CircuitCode.SessionID;
+ this.CircuitCode = cirpack.CircuitCode.Code;
+ this.firstName = sessionInfo.LoginInfo.First;
+ this.lastName = sessionInfo.LoginInfo.Last;
+
+ if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
+ {
+ this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;
+ }
+ InitNewClient();
+
+ ClientLoop();
+ }
+ }
+ # endregion
+
+
+ protected override void KillThread()
+ {
+ this.ClientThread.Abort();
+ }
+
+ #region Inventory Creation
+ private void SetupInventory(AuthenticateResponse sessionInfo)
+ {
+
+ }
+ private AgentInventory CreateInventory(LLUUID baseFolder)
+ {
+ AgentInventory inventory = null;
+
+ return inventory;
+ }
+
+ private void CreateInventoryItem(CreateInventoryItemPacket packet)
+ {
+
+ }
+ #endregion
+
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs
deleted file mode 100644
index b9773c6..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs
+++ /dev/null
@@ -1,682 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace OpenSim
-{
- partial class ClientView
- {
- public event ChatFromViewer OnChatFromViewer;
- public event RezObject OnRezObject;
- public event GenericCall4 OnDeRezObject;
- public event ModifyTerrain OnModifyTerrain;
- public event GenericCall OnRegionHandShakeReply;
- public event GenericCall OnRequestWearables;
- public event SetAppearance OnSetAppearance;
- public event GenericCall2 OnCompleteMovementToRegion;
- public event GenericCall3 OnAgentUpdate;
- public event StartAnim OnStartAnim;
- public event GenericCall OnRequestAvatarsData;
- public event LinkObjects OnLinkObjects;
- public event GenericCall4 OnAddPrim;
- public event UpdateShape OnUpdatePrimShape;
- public event ObjectSelect OnObjectSelect;
- public event UpdatePrimFlags OnUpdatePrimFlags;
- public event UpdatePrimTexture OnUpdatePrimTexture;
- public event UpdatePrimVector OnUpdatePrimPosition;
- public event UpdatePrimRotation OnUpdatePrimRotation;
- public event UpdatePrimVector OnUpdatePrimScale;
- public event StatusChange OnChildAgentStatus;
- public event GenericCall2 OnStopMovement;
- public event NewAvatar OnNewAvatar;
- public event GenericCall6 OnRemoveAvatar;
-
- public event ParcelPropertiesRequest OnParcelPropertiesRequest;
- public event ParcelDivideRequest OnParcelDivideRequest;
- public event ParcelJoinRequest OnParcelJoinRequest;
- public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
-
- public event EstateOwnerMessageRequest OnEstateOwnerMessage;
-
- ///
- ///
- ///
- public LLVector3 StartPos
- {
- get
- {
- return startpos;
- }
- set
- {
- startpos = value;
- }
- }
-
- ///
- ///
- ///
- public LLUUID AgentId
- {
- get
- {
- return this.AgentID;
- }
- }
-
- ///
- ///
- ///
- public string FirstName
- {
- get
- {
- return this.firstName;
- }
-
- }
-
- ///
- ///
- ///
- public string LastName
- {
- get
- {
- return this.lastName;
- }
- }
-
- #region World/Avatar to Client
-
- ///
- ///
- ///
- ///
- public void SendRegionHandshake(RegionInfo regionInfo)
- {
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
- RegionHandshakePacket handshake = new RegionHandshakePacket();
-
- handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
- handshake.RegionInfo.IsEstateManager = false;
- handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;
- handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;
- handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;
- handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;
- handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;
- handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;
- handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;
- handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;
- handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;
- handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;
-
-
- handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;
-
- handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.estateSettings.waterHeight + "\0");
- handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;
- handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;
- handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;
- handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;
- handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;
- handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;
- handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;
- handshake.RegionInfo.TerrainDetail2 =regionInfo.estateSettings.terrainDetail2;
- handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;
- handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
-
- this.OutPacket(handshake);
- }
-
- ///
- ///
- ///
- ///
- public void MoveAgentIntoRegion(RegionInfo regInfo)
- {
- AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
- mov.AgentData.SessionID = this.SessionID;
- mov.AgentData.AgentID = this.AgentID;
- mov.Data.RegionHandle = regInfo.RegionHandle;
- // TODO - dynamicalise this stuff
- mov.Data.Timestamp = 1172750370;
- mov.Data.Position = this.startpos;
- mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
-
- OutPacket(mov);
- }
-
- public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
- {
- SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
- {
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
- reply.ChatData.Audible = 1;
- reply.ChatData.Message = message;
- reply.ChatData.ChatType = type;
- reply.ChatData.SourceType = 1;
- reply.ChatData.Position = fromPos;
- reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
- reply.ChatData.OwnerID = fromAgentID;
- reply.ChatData.SourceID = fromAgentID;
-
- this.OutPacket(reply);
- }
-
-
- ///
- /// Send the region heightmap to the client
- ///
- /// heightmap
- public virtual void SendLayerData(float[] map)
- {
- try
- {
- int[] patches = new int[4];
-
- for (int y = 0; y < 16; y++)
- {
- for (int x = 0; x < 16; x = x + 4)
- {
- patches[0] = x + 0 + y * 16;
- patches[1] = x + 1 + y * 16;
- patches[2] = x + 2 + y * 16;
- patches[3] = x + 3 + y * 16;
-
- Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
- OutPacket(layerpack);
- }
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Sends a specified patch to a client
- ///
- /// Patch coordinate (x) 0..16
- /// Patch coordinate (y) 0..16
- /// heightmap
- public void SendLayerData(int px, int py, float[] map)
- {
- try
- {
- int[] patches = new int[1];
- int patchx, patchy;
- patchx = px / 16;
- patchy = py / 16;
-
- patches[0] = patchx + 0 + patchy * 16;
-
- Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
- OutPacket(layerpack);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
- }
- }
-
- public void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)
- {
- EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
- enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
- enablesimpacket.SimulatorInfo.Handle = neighbourHandle;
-
- byte[] byteIP = neighbourIP.GetAddressBytes();
- enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
- enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
- enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
- enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
- enablesimpacket.SimulatorInfo.Port = neighbourPort;
- OutPacket(enablesimpacket);
- }
-
- public AgentCircuitData RequestClientInfo()
- {
- AgentCircuitData agentData = new AgentCircuitData();
- agentData.AgentID = this.AgentId;
- agentData.SessionID = this.SessionID;
- agentData.SecureSessionID = this.SecureSessionID;
- agentData.circuitcode = this.CircuitCode;
- agentData.child = false;
- agentData.firstname = this.firstName;
- agentData.lastname = this.lastName;
-
- return agentData;
- }
-
- #region Appearance/ Wearables Methods
-
- ///
- ///
- ///
- ///
- public void SendWearables(AvatarWearable[] wearables)
- {
- AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
- aw.AgentData.AgentID = this.AgentID;
- aw.AgentData.SerialNum = 0;
- aw.AgentData.SessionID = this.SessionID;
-
- aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
- AgentWearablesUpdatePacket.WearableDataBlock awb;
- for (int i = 0; i < wearables.Length; i++)
- {
- awb = new AgentWearablesUpdatePacket.WearableDataBlock();
- awb.WearableType = (byte)i;
- awb.AssetID = wearables[i].AssetID;
- awb.ItemID = wearables[i].ItemID;
- aw.WearableData[i] = awb;
- }
-
- this.OutPacket(aw);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry)
- {
- AvatarAppearancePacket avp = new AvatarAppearancePacket();
- avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
- avp.ObjectData.TextureEntry = textureEntry;
-
- AvatarAppearancePacket.VisualParamBlock avblock = null;
- for (int i = 0; i < visualParams.Length; i++)
- {
- avblock = new AvatarAppearancePacket.VisualParamBlock();
- avblock.ParamValue = visualParams[i];
- avp.VisualParam[i] = avblock;
- }
-
- avp.Sender.IsTrial = false;
- avp.Sender.ID = agentID;
- OutPacket(avp);
- }
-
- #endregion
-
- #region Avatar Packet/data sending Methods
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)
- {
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
- //send a objectupdate packet with information about the clients avatar
-
- ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
- objupdate.RegionData.RegionHandle = regionInfo.RegionHandle;
- objupdate.RegionData.TimeDilation = 64096;
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
- objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket();
- //give this avatar object a local id and assign the user a name
-
- objupdate.ObjectData[0].ID = avatarLocalID;
- objupdate.ObjectData[0].FullID = avatarID;
- objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0");
- libsecondlife.LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
- byte[] pb = pos2.GetBytes();
- Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
-
- OutPacket(objupdate);
-
- }
-
-
- ///
- ///
- ///
- ///
- protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata)
- {
- objdata.PSBlock = new byte[0];
- objdata.ExtraParams = new byte[1];
- objdata.MediaURL = new byte[0];
- objdata.NameValue = new byte[0];
- objdata.Text = new byte[0];
- objdata.TextColor = new byte[4];
- objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
- objdata.JointPivot = new LLVector3(0, 0, 0);
- objdata.Material = 4;
- objdata.TextureAnim = new byte[0];
- objdata.Sound = LLUUID.Zero;
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
- objdata.TextureEntry = ntex.ToBytes();
- objdata.State = 0;
- objdata.Data = new byte[0];
-
- objdata.ObjectData = new byte[76];
- objdata.ObjectData[15] = 128;
- objdata.ObjectData[16] = 63;
- objdata.ObjectData[56] = 128;
- objdata.ObjectData[61] = 102;
- objdata.ObjectData[62] = 40;
- objdata.ObjectData[63] = 61;
- objdata.ObjectData[64] = 189;
- }
-
- ///
- ///
- ///
- ///
- protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket()
- {
- libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
-
- SetDefaultAvatarPacketValues(ref objdata);
- objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
- objdata.PathCurve = 16;
- objdata.ProfileCurve = 1;
- objdata.PathScaleX = 100;
- objdata.PathScaleY = 100;
- objdata.ParentID = 0;
- objdata.OwnerID = LLUUID.Zero;
- objdata.Scale = new LLVector3(1, 1, 1);
- objdata.PCode = 47;
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
- pos.X = 100f;
- objdata.ID = 8880000;
- objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
- libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
- //objdata.FullID=user.AgentID;
- byte[] pb = pos.GetBytes();
- Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
-
- return objdata;
- }
-
- #endregion
-
- #region Primitive Packet/data Sending Methods
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
- {
- ObjectAttachPacket attach = new ObjectAttachPacket();
- attach.AgentData.AgentID = this.AgentID;
- attach.AgentData.SessionID = this.SessionID;
- attach.AgentData.AttachmentPoint = attachPoint;
- attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
- attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
- attach.ObjectData[0].ObjectLocalID = localID;
- attach.ObjectData[0].Rotation = rotation;
-
- this.OutPacket(attach);
- }
-
- ///
- /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
- /// or big changes to a existing primitive.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID)
- {
- ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
- outPacket.RegionData.RegionHandle = regionHandle;
- outPacket.RegionData.TimeDilation = timeDilation;
- outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
- outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID);
- outPacket.ObjectData[0].ID = localID;
- outPacket.ObjectData[0].FullID = primData.FullID;
- byte[] pb = pos.GetBytes();
- Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
- byte[] rot = rotation.GetBytes();
- Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 48, rot.Length);
- OutPacket(outPacket);
- }
-
- ///
- /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive
- /// or big changes to a existing primitive.
- /// uses default rotation
- ///
- ///
- ///
- public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID)
- {
- ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
- outPacket.RegionData.RegionHandle = regionHandle;
- outPacket.RegionData.TimeDilation = timeDilation;
- outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
- outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID);
- outPacket.ObjectData[0].ID = localID;
- outPacket.ObjectData[0].FullID = primData.FullID;
- byte[] pb = pos.GetBytes();
- Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
-
- OutPacket(outPacket);
- }
-
- ///
- /// Create the ObjectDataBlock for a ObjectUpdatePacket (for a Primitive)
- ///
- ///
- ///
- protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID)
- {
- ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
- this.SetDefaultPrimPacketValues(objupdate);
- objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
- this.SetPrimPacketShapeData(objupdate, primData, textureID);
-
- return objupdate;
- }
-
- ///
- /// Set some default values in a ObjectUpdatePacket
- ///
- ///
- protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
- {
- objdata.PSBlock = new byte[0];
- objdata.ExtraParams = new byte[1];
- objdata.MediaURL = new byte[0];
- objdata.NameValue = new byte[0];
- objdata.Text = new byte[0];
- objdata.TextColor = new byte[4];
- objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
- objdata.JointPivot = new LLVector3(0, 0, 0);
- objdata.Material = 3;
- objdata.TextureAnim = new byte[0];
- objdata.Sound = LLUUID.Zero;
- objdata.State = 0;
- objdata.Data = new byte[0];
-
- objdata.ObjectData = new byte[60];
- objdata.ObjectData[46] = 128;
- objdata.ObjectData[47] = 63;
- }
-
- ///
- /// Copy the data from a PrimData object to a ObjectUpdatePacket
- ///
- ///
- ///
- protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimData primData, LLUUID textureID)
- {
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
- objectData.TextureEntry = ntex.ToBytes();
- objectData.OwnerID = primData.OwnerID;
- objectData.PCode = primData.PCode;
- objectData.PathBegin =primData.PathBegin;
- objectData.PathEnd = primData.PathEnd;
- objectData.PathScaleX = primData.PathScaleX;
- objectData.PathScaleY = primData.PathScaleY;
- objectData.PathShearX = primData.PathShearX;
- objectData.PathShearY = primData.PathShearY;
- objectData.PathSkew = primData.PathSkew;
- objectData.ProfileBegin = primData.ProfileBegin;
- objectData.ProfileEnd = primData.ProfileEnd;
- objectData.Scale = primData.Scale;
- objectData.PathCurve = primData.PathCurve;
- objectData.ProfileCurve = primData.ProfileCurve;
- objectData.ParentID = primData.ParentID;
- objectData.ProfileHollow = primData.ProfileHollow;
- objectData.PathRadiusOffset = primData.PathRadiusOffset;
- objectData.PathRevolutions = primData.PathRevolutions;
- objectData.PathTaperX = primData.PathTaperX;
- objectData.PathTaperY = primData.PathTaperY;
- objectData.PathTwist = primData.PathTwist;
- objectData.PathTwistBegin = primData.PathTwistBegin;
- }
-
- public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation)
- {
- ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
- terse.RegionData.RegionHandle = regionHandle;
- terse.RegionData.TimeDilation = timeDilation;
- terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
- terse.ObjectData[0] = this.CreatePrimImprovedBlock(localID, position, rotation);
-
- this.OutPacket(terse);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreatePrimImprovedBlock(uint localID, LLVector3 position, LLQuaternion rotation)
- {
- uint ID = localID;
- byte[] bytes = new byte[60];
-
- int i = 0;
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
- dat.TextureEntry = new byte[0];
- bytes[i++] = (byte)(ID % 256);
- bytes[i++] = (byte)((ID >> 8) % 256);
- bytes[i++] = (byte)((ID >> 16) % 256);
- bytes[i++] = (byte)((ID >> 24) % 256);
- bytes[i++] = 0;
- bytes[i++] = 0;
-
- byte[] pb = position.GetBytes();
- Array.Copy(pb, 0, bytes, i, pb.Length);
- i += 12;
- ushort ac = 32767;
-
- //vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- //accel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- ushort rw, rx, ry, rz;
- rw = (ushort)(32768 * (rotation.W + 1));
- rx = (ushort)(32768 * (rotation.X + 1));
- ry = (ushort)(32768 * (rotation.Y + 1));
- rz = (ushort)(32768 * (rotation.Z + 1));
-
- //rot
- bytes[i++] = (byte)(rx % 256);
- bytes[i++] = (byte)((rx >> 8) % 256);
- bytes[i++] = (byte)(ry % 256);
- bytes[i++] = (byte)((ry >> 8) % 256);
- bytes[i++] = (byte)(rz % 256);
- bytes[i++] = (byte)((rz >> 8) % 256);
- bytes[i++] = (byte)(rw % 256);
- bytes[i++] = (byte)((rw >> 8) % 256);
-
- //rotation vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- dat.Data = bytes;
- return dat;
- }
- #endregion
-
- #endregion
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs
deleted file mode 100644
index 31749d8..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Assets;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-using OpenSim.Caches;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace OpenSim
-{
- partial class ClientView
- {
- public class AgentAssetUpload
- {
- private Dictionary transactions = new Dictionary();
- private ClientView ourClient;
- private AssetCache m_assetCache;
- private InventoryCache m_inventoryCache;
-
- public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)
- {
- this.ourClient = client;
- m_assetCache = assetCache;
- m_inventoryCache = inventoryCache;
- }
-
- public void AddUpload(LLUUID transactionID, AssetBase asset)
- {
- AssetTransaction upload = new AssetTransaction();
- lock (this.transactions)
- {
- upload.Asset = asset;
- upload.TransactionID = transactionID;
- this.transactions.Add(transactionID, upload);
- }
- if (upload.Asset.Data.Length > 2)
- {
- //is complete
- upload.UploadComplete = true;
- AssetUploadCompletePacket response = new AssetUploadCompletePacket();
- response.AssetBlock.Type = asset.Type;
- response.AssetBlock.Success = true;
- response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
- this.ourClient.OutPacket(response);
- m_assetCache.AddAsset(asset);
- }
- else
- {
- upload.UploadComplete = false;
- upload.XferID = Util.GetNextXferID();
- RequestXferPacket xfer = new RequestXferPacket();
- xfer.XferID.ID = upload.XferID;
- xfer.XferID.VFileType = upload.Asset.Type;
- xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);
- xfer.XferID.FilePath = 0;
- xfer.XferID.Filename = new byte[0];
- this.ourClient.OutPacket(xfer);
- }
-
- }
-
- public AssetBase GetUpload(LLUUID transactionID)
- {
- if (this.transactions.ContainsKey(transactionID))
- {
- return this.transactions[transactionID].Asset;
- }
-
- return null;
- }
-
- public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
- {
- // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
- AssetBase asset = null;
- if (pack.AssetBlock.Type == 0)
- {
-
- //first packet for transaction
- asset = new AssetBase();
- asset.FullID = assetID;
- asset.Type = pack.AssetBlock.Type;
- asset.InvType = asset.Type;
- asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
- asset.Data = pack.AssetBlock.AssetData;
-
-
- }
- else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)
- {
-
- asset = new AssetBase();
- asset.FullID = assetID;
- // Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
- asset.Type = pack.AssetBlock.Type;
- asset.InvType = asset.Type;
- asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
- asset.Data = pack.AssetBlock.AssetData;
-
-
- }
-
- if (asset != null)
- {
- this.AddUpload(pack.AssetBlock.TransactionID, asset);
- }
- else
- {
-
- //currently we don't support this asset type
- //so lets just tell the client that the upload is complete
- AssetUploadCompletePacket response = new AssetUploadCompletePacket();
- response.AssetBlock.Type = pack.AssetBlock.Type;
- response.AssetBlock.Success = true;
- response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);
- this.ourClient.OutPacket(response);
- }
-
- }
-
- #region Xfer packet system for larger uploads
-
- public void HandleXferPacket(SendXferPacketPacket xferPacket)
- {
- lock (this.transactions)
- {
- foreach (AssetTransaction trans in this.transactions.Values)
- {
- if (trans.XferID == xferPacket.XferID.ID)
- {
- if (trans.Asset.Data.Length > 1)
- {
- byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];
- Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);
- Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);
- trans.Asset.Data = newArray;
- }
- else
- {
- byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];
- Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);
- trans.Asset.Data = newArray;
- }
-
- if ((xferPacket.XferID.Packet & 2147483648) != 0)
- {
- //end of transfer
- trans.UploadComplete = true;
- AssetUploadCompletePacket response = new AssetUploadCompletePacket();
- response.AssetBlock.Type = trans.Asset.Type;
- response.AssetBlock.Success = true;
- response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
- this.ourClient.OutPacket(response);
-
- m_assetCache.AddAsset(trans.Asset);
- //check if we should add it to inventory
- if (trans.AddToInventory)
- {
- // m_assetCache.AddAsset(trans.Asset);
- m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
- }
-
-
- }
- break;
- }
-
- }
- }
-
- ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
- confirmXfer.XferID.ID = xferPacket.XferID.ID;
- confirmXfer.XferID.Packet = xferPacket.XferID.Packet;
- this.ourClient.OutPacket(confirmXfer);
- }
-
- #endregion
-
- public AssetBase AddUploadToAssetCache(LLUUID transactionID)
- {
- AssetBase asset = null;
- if (this.transactions.ContainsKey(transactionID))
- {
- AssetTransaction trans = this.transactions[transactionID];
- if (trans.UploadComplete)
- {
- m_assetCache.AddAsset(trans.Asset);
- asset = trans.Asset;
- }
- }
-
- return asset;
- }
-
- public void CreateInventoryItem(CreateInventoryItemPacket packet)
- {
- if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
- {
- AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
- trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
- trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
- trans.Asset.Type = packet.InventoryBlock.Type;
- trans.Asset.InvType = packet.InventoryBlock.InvType;
- if (trans.UploadComplete)
- {
- //already complete so we can add it to the inventory
- //m_assetCache.AddAsset(trans.Asset);
- m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
- }
- else
- {
- trans.AddToInventory = true;
- trans.InventFolder = packet.InventoryBlock.FolderID;
- }
- }
- }
-
- private class AssetTransaction
- {
- public uint XferID;
- public AssetBase Asset;
- public bool AddToInventory;
- public LLUUID InventFolder = LLUUID.Zero;
- public bool UploadComplete = false;
- public LLUUID TransactionID = LLUUID.Zero;
-
- public AssetTransaction()
- {
-
- }
- }
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
deleted file mode 100644
index 035eb4c..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-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;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
-
-namespace OpenSim
-{
- public partial class ClientView
- {
- protected virtual void RegisterLocalPacketHandlers()
- {
- this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);
- this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);
- this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);
- }
-
- protected virtual bool Logout(ClientView simClient, Packet packet)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
- //send reply to let the client logout
- LogoutReplyPacket logReply = new LogoutReplyPacket();
- logReply.AgentData.AgentID = this.AgentID;
- logReply.AgentData.SessionID = this.SessionID;
- logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
- logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
- logReply.InventoryData[0].ItemID = LLUUID.Zero;
- OutPacket(logReply);
- //tell all clients to kill our object
- KillObjectPacket kill = new KillObjectPacket();
- kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
- kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
- // kill.ObjectData[0].ID = this.ClientAvatar.localid;
- foreach (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(kill);
- }
-
- this.m_inventoryCache.ClientLeaving(this.AgentID, null);
-
-
- // m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
- /*lock (m_world.Entities)
- {
- m_world.Entities.Remove(this.AgentID);
- }*/
- // m_world.RemoveViewerAgent(this);
- //need to do other cleaning up here too
- m_clientThreads.Remove(this.CircuitCode);
- m_networkServer.RemoveClientCircuit(this.CircuitCode);
- this.ClientThread.Abort();
- return true;
- }
-
- protected bool AgentTextureCached(ClientView simclient, Packet packet)
- {
- // Console.WriteLine(packet.ToString());
- AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
- AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
- cachedresp.AgentData.AgentID = this.AgentID;
- cachedresp.AgentData.SessionID = this.SessionID;
- cachedresp.AgentData.SerialNum = this.cachedtextureserial;
- this.cachedtextureserial++;
- cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
- for (int i = 0; i < chechedtex.WearableData.Length; i++)
- {
- cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
- cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
- cachedresp.WearableData[i].TextureID = LLUUID.Zero;
- cachedresp.WearableData[i].HostName = new byte[0];
- }
- this.OutPacket(cachedresp);
- return true;
- }
-
- protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
- {
- MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
- for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
- {
- if (multipleupdate.ObjectData[i].Type == 9) //change position
- {
- if (OnUpdatePrimPosition != null)
- {
- libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
- OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
- }
- //should update stored position of the prim
- }
- else if (multipleupdate.ObjectData[i].Type == 10)//rotation
- {
- if (OnUpdatePrimRotation != null)
- {
- libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
- OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
- }
- }
- else if (multipleupdate.ObjectData[i].Type == 13)//scale
- {
- if (OnUpdatePrimScale != null)
- {
- libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
- OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
- }
- }
- }
- return true;
- }
-
- public void RequestMapLayer() //should be getting the map layer from the grid server
- {
- //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
- MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
- mapReply.AgentData.AgentID = this.AgentID;
- mapReply.AgentData.Flags = 0;
- mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
- mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
- mapReply.LayerData[0].Bottom = 800;
- mapReply.LayerData[0].Left = 800;
- mapReply.LayerData[0].Top = 1200;
- mapReply.LayerData[0].Right = 1200;
- mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
- this.OutPacket(mapReply);
- }
-
- public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
- {
- IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
- MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
- mbReply.AgentData.AgentID = this.AgentID;
- int len;
- if (simMapProfiles == null)
- len = 0;
- else
- len = simMapProfiles.Count;
-
- mbReply.Data = new MapBlockReplyPacket.DataBlock[len];
- int iii;
- for (iii = 0; iii < len; iii++)
- {
- Hashtable mp = (Hashtable)simMapProfiles[iii];
- mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
- mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
- mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
- mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
- mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
- mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
- mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);
- mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
- mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
- }
- this.OutPacket(mbReply);
- }
-
- protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)
- {
- PrimData PData = new PrimData();
- PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
- PData.PCode = addPacket.ObjectData.PCode;
- PData.PathBegin = addPacket.ObjectData.PathBegin;
- PData.PathEnd = addPacket.ObjectData.PathEnd;
- PData.PathScaleX = addPacket.ObjectData.PathScaleX;
- PData.PathScaleY = addPacket.ObjectData.PathScaleY;
- PData.PathShearX = addPacket.ObjectData.PathShearX;
- PData.PathShearY = addPacket.ObjectData.PathShearY;
- PData.PathSkew = addPacket.ObjectData.PathSkew;
- PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
- PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
- PData.Scale = addPacket.ObjectData.Scale;
- PData.PathCurve = addPacket.ObjectData.PathCurve;
- PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
- PData.ParentID = 0;
- PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
- PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
- PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
- PData.PathTaperX = addPacket.ObjectData.PathTaperX;
- PData.PathTaperY = addPacket.ObjectData.PathTaperY;
- PData.PathTwist = addPacket.ObjectData.PathTwist;
- PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-
- return PData;
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
deleted file mode 100644
index c6749a1..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-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;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
-
-namespace OpenSim
-{
- public partial class ClientView
- {
- protected override void ProcessInPacket(Packet Pack)
- {
- ack_pack(Pack);
- if (debug)
- {
- if (Pack.Type != PacketType.AgentUpdate)
- {
- Console.WriteLine(Pack.Type.ToString());
- }
- }
-
- if (this.ProcessPacketMethod(Pack))
- {
- //there is a handler registered that handled this packet type
- return;
- }
- else
- {
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-
- switch (Pack.Type)
- {
- case PacketType.ViewerEffect:
- ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
- foreach (ClientView client in m_clientThreads.Values)
- {
- if (client.AgentID != this.AgentID)
- {
- viewer.AgentData.AgentID = client.AgentID;
- viewer.AgentData.SessionID = client.SessionID;
- client.OutPacket(viewer);
- }
- }
- break;
-
- #region World/Avatar
- case PacketType.ChatFromViewer:
- ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
- if (Util.FieldToString(inchatpack.ChatData.Message) == "")
- {
- //empty message so don't bother with it
- break;
- }
- string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
- byte[] message = inchatpack.ChatData.Message;
- byte type = inchatpack.ChatData.Type;
- LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
- LLUUID fromAgentID = AgentID;
- if (OnChatFromViewer != null)
- {
- this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
- }
- break;
- case PacketType.RezObject:
- RezObjectPacket rezPacket = (RezObjectPacket)Pack;
- AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
- if (inven != null)
- {
- if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
- {
- AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
- if (asset != null)
- {
- if (OnRezObject != null)
- {
- this.OnRezObject(asset, rezPacket.RezData.RayEnd);
- this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);
- }
- }
- }
- }
- break;
- case PacketType.DeRezObject:
- if (OnDeRezObject != null)
- {
- OnDeRezObject(Pack, this);
- }
- break;
- case PacketType.ModifyLand:
- ModifyLandPacket modify = (ModifyLandPacket)Pack;
- if (modify.ParcelData.Length > 0)
- {
- if (OnModifyTerrain != null)
- {
- OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
- }
- }
- break;
- case PacketType.RegionHandshakeReply:
- if (OnRegionHandShakeReply != null)
- {
- OnRegionHandShakeReply(this);
- }
- break;
- case PacketType.AgentWearablesRequest:
- if (OnRequestWearables != null)
- {
- OnRequestWearables(this);
- }
- if (OnRequestAvatarsData != null)
- {
- OnRequestAvatarsData(this);
- }
- break;
- case PacketType.AgentSetAppearance:
- AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
- if (OnSetAppearance != null)
- {
- OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
- }
- break;
- case PacketType.CompleteAgentMovement:
- if (this.m_child) this.UpgradeClient();
- if (OnCompleteMovementToRegion != null)
- {
- OnCompleteMovementToRegion();
- }
- // this.EnableNeighbours();
- break;
- case PacketType.AgentUpdate:
- if (OnAgentUpdate != null)
- {
- OnAgentUpdate(Pack);
- }
- break;
- case PacketType.AgentAnimation:
- if (!m_child)
- {
- AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
- for (int i = 0; i < AgentAni.AnimationList.Length; i++)
- {
- if (AgentAni.AnimationList[i].StartAnim)
- {
- if (OnStartAnim != null)
- {
- OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
- }
- }
- }
- }
- break;
-
- #endregion
-
- #region Objects/Prims
- case PacketType.ObjectLink:
- // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
- ObjectLinkPacket link = (ObjectLinkPacket)Pack;
- uint parentprimid = 0;
- List childrenprims = new List();
- if (link.ObjectData.Length > 1)
- {
- parentprimid = link.ObjectData[0].ObjectLocalID;
-
- for (int i = 1; i < link.ObjectData.Length; i++)
- {
- childrenprims.Add(link.ObjectData[i].ObjectLocalID);
- }
- }
- if (OnLinkObjects != null)
- {
- OnLinkObjects(parentprimid, childrenprims);
- }
- break;
- case PacketType.ObjectAdd:
- // m_world.AddNewPrim((ObjectAddPacket)Pack, this);
- if (OnAddPrim != null)
- {
- OnAddPrim(Pack, this);
- }
- break;
- case PacketType.ObjectShape:
- ObjectShapePacket shape = (ObjectShapePacket)Pack;
- for (int i = 0; i < shape.ObjectData.Length; i++)
- {
- if (OnUpdatePrimShape != null)
- {
- OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);
- }
- }
- break;
- case PacketType.ObjectSelect:
- ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
- for (int i = 0; i < incomingselect.ObjectData.Length; i++)
- {
- if (OnObjectSelect != null)
- {
- OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
- }
- }
- break;
- case PacketType.ObjectFlagUpdate:
- ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
- if (OnUpdatePrimFlags != null)
- {
- OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
- }
- break;
- case PacketType.ObjectImage:
- ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
- for (int i = 0; i < imagePack.ObjectData.Length; i++)
- {
- if (OnUpdatePrimTexture != null)
- {
- OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
- }
- }
- break;
- #endregion
-
- #region Inventory/Asset/Other related packets
- case PacketType.RequestImage:
- RequestImagePacket imageRequest = (RequestImagePacket)Pack;
- for (int i = 0; i < imageRequest.RequestImage.Length; i++)
- {
- m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
- }
- break;
- case PacketType.TransferRequest:
- //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
- TransferRequestPacket transfer = (TransferRequestPacket)Pack;
- m_assetCache.AddAssetRequest(this, transfer);
- break;
- case PacketType.AssetUploadRequest:
- AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
- this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
- break;
- case PacketType.RequestXfer:
- //Console.WriteLine(Pack.ToString());
- break;
- case PacketType.SendXferPacket:
- this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
- break;
- case PacketType.CreateInventoryFolder:
- CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
- m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
- //Console.WriteLine(Pack.ToString());
- break;
- case PacketType.CreateInventoryItem:
- //Console.WriteLine(Pack.ToString());
- CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
- if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
- {
- this.UploadAssets.CreateInventoryItem(createItem);
- }
- else
- {
- // Console.Write(Pack.ToString());
- this.CreateInventoryItem(createItem);
- }
- break;
- case PacketType.FetchInventory:
- //Console.WriteLine("fetch item packet");
- FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
- m_inventoryCache.FetchInventory(this, FetchInventory);
- break;
- case PacketType.FetchInventoryDescendents:
- FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
- m_inventoryCache.FetchInventoryDescendents(this, Fetch);
- break;
- case PacketType.UpdateInventoryItem:
- UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
- //Console.WriteLine(Pack.ToString());
- for (int i = 0; i < update.InventoryData.Length; i++)
- {
- if (update.InventoryData[i].TransactionID != LLUUID.Zero)
- {
- AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
- if (asset != null)
- {
- // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
- m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
- }
- else
- {
- asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
- if (asset != null)
- {
- //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
- m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
- }
- else
- {
- //Console.WriteLine("trying to update inventory item, but asset is null");
- }
- }
- }
- else
- {
- m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
- }
- }
- break;
- case PacketType.RequestTaskInventory:
- // Console.WriteLine(Pack.ToString());
- RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
- ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
- bool foundent = false;
- /* foreach (Entity ent in m_world.Entities.Values)
- {
- if (ent.localid == requesttask.InventoryData.LocalID)
- {
- replytask.InventoryData.TaskID = ent.uuid;
- replytask.InventoryData.Serial = 0;
- replytask.InventoryData.Filename = new byte[0];
- foundent = true;
- }
- }
- if (foundent)
- {
- this.OutPacket(replytask);
- }*/
- break;
- case PacketType.UpdateTaskInventory:
- // Console.WriteLine(Pack.ToString());
- UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
- AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
- /*if (myinventory != null)
- {
- if (updatetask.UpdateData.Key == 0)
- {
- if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
- {
- if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
- {
- LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
- AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
- if (assBase != null)
- {
- foreach (Entity ent in m_world.Entities.Values)
- {
- if (ent.localid == updatetask.UpdateData.LocalID)
- {
- if (ent is OpenSim.world.Primitive)
- {
- this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
- }
- }
- }
- }
- }
- }
- }
- }*/
- break;
- case PacketType.MapLayerRequest:
- this.RequestMapLayer();
- break;
- case PacketType.MapBlockRequest:
- MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;
-
- this.RequestMapBlocks(MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
- break;
- case PacketType.TeleportLandmarkRequest:
- TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
-
- TeleportStartPacket tpStart = new TeleportStartPacket();
- tpStart.Info.TeleportFlags = 8; // tp via lm
- this.OutPacket(tpStart);
-
- TeleportProgressPacket tpProgress = new TeleportProgressPacket();
- tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
- tpProgress.Info.TeleportFlags = 8;
- tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
- this.OutPacket(tpProgress);
-
- // Fetch landmark
- LLUUID lmid = tpReq.Info.LandmarkID;
- AssetBase lma = this.m_assetCache.GetAsset(lmid);
- if (lma != null)
- {
- AssetLandmark lm = new AssetLandmark(lma);
-
- if (lm.RegionID == m_regionData.SimUUID)
- {
- TeleportLocalPacket tpLocal = new TeleportLocalPacket();
-
- tpLocal.Info.AgentID = tpReq.Info.AgentID;
- tpLocal.Info.TeleportFlags = 8; // Teleport via landmark
- tpLocal.Info.LocationID = 2;
- tpLocal.Info.Position = lm.Position;
- OutPacket(tpLocal);
- }
- else
- {
- TeleportCancelPacket tpCancel = new TeleportCancelPacket();
- tpCancel.Info.AgentID = tpReq.Info.AgentID;
- tpCancel.Info.SessionID = tpReq.Info.SessionID;
- OutPacket(tpCancel);
- }
- }
- else
- {
- Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");
-
- TeleportCancelPacket tpCancel = new TeleportCancelPacket();
- tpCancel.Info.AgentID = tpReq.Info.AgentID;
- tpCancel.Info.SessionID = tpReq.Info.SessionID;
- OutPacket(tpCancel);
- }
- break;
- case PacketType.TeleportLocationRequest:
- TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
- Console.WriteLine(tpLocReq.ToString());
-
- tpStart = new TeleportStartPacket();
- tpStart.Info.TeleportFlags = 16; // Teleport via location
- Console.WriteLine(tpStart.ToString());
- OutPacket(tpStart);
-
- 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 tpLocal = new TeleportLocalPacket();
- tpLocal.Info.AgentID = tpLocReq.AgentData.AgentID;
- tpLocal.Info.TeleportFlags = tpStart.Info.TeleportFlags;
- tpLocal.Info.LocationID = 2;
- tpLocal.Info.LookAt = tpLocReq.Info.LookAt;
- tpLocal.Info.Position = tpLocReq.Info.Position;
- OutPacket(tpLocal);
-
- }
- break;
- #endregion
-
- #region Parcel related packets
- case PacketType.ParcelPropertiesRequest:
- ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
- if(OnParcelPropertiesRequest != null)
- {
- OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this);
- }
- break;
- case PacketType.ParcelDivide:
- ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
- if (OnParcelDivideRequest != null)
- {
- OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
- }
- break;
- case PacketType.ParcelJoin:
- ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
- if (OnParcelJoinRequest != null)
- {
- OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
- }
- break;
- case PacketType.ParcelPropertiesUpdate:
- ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
- if (OnParcelPropertiesUpdateRequest != null)
- {
- OnParcelPropertiesUpdateRequest(updatePacket, this);
- }
- break;
- #endregion
-
- #region Estate Packets
- case PacketType.EstateOwnerMessage:
- EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
- if (OnEstateOwnerMessage != null)
- {
- OnEstateOwnerMessage(messagePacket, this);
- }
- break;
- #endregion
-
- #region unimplemented handlers
- case PacketType.AgentIsNowWearing:
- // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
- //Console.WriteLine(Pack.ToString());
- break;
- case PacketType.ObjectScale:
- //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
- break;
- #endregion
- }
- }
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs
deleted file mode 100644
index e9c1f2d..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-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;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
-using OpenSim.Caches;
-
-namespace OpenSim
-{
- public delegate bool PacketMethod(ClientView simClient, Packet packet);
-
- ///
- /// Handles new client connections
- /// Constructor takes a single Packet and authenticates everything
- ///
- public partial class ClientView : ClientViewBase, IClientAPI
- {
- public static TerrainManager TerrainManager;
-
- protected static Dictionary PacketHandlers = new Dictionary(); //Global/static handlers for all clients
- protected Dictionary m_packetHandlers = new Dictionary(); //local handlers for this instance
-
- public LLUUID AgentID;
- public LLUUID SessionID;
- public LLUUID SecureSessionID = LLUUID.Zero;
- public string firstName;
- public string lastName;
- public bool m_child = false;
- private UseCircuitCodePacket cirpack;
- public Thread ClientThread;
- public LLVector3 startpos;
-
- private AgentAssetUpload UploadAssets;
- private LLUUID newAssetFolder = LLUUID.Zero;
- private bool debug = false;
- 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;
- protected AuthenticateSessionsBase m_authenticateSessionsHandler;
-
- public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
- {
- m_world = world;
- m_clientThreads = clientThreads;
- m_assetCache = assetCache;
-
- m_networkServer = packServer;
- m_inventoryCache = inventoryCache;
- m_authenticateSessionsHandler = authenSessions;
-
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
- cirpack = initialcirpack;
- userEP = remoteEP;
-
- this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
- this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
-
- PacketQueue = new BlockingQueue();
-
- this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
- AckTimer = new System.Timers.Timer(500);
- AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
- AckTimer.Start();
-
- this.RegisterLocalPacketHandlers();
-
- ClientThread = new Thread(new ThreadStart(AuthUser));
- ClientThread.IsBackground = true;
- ClientThread.Start();
- }
-
- # region Client Methods
- public void UpgradeClient()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");
- this.m_child = false;
- this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
- m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
- OnChildAgentStatus(this.m_child);
- }
-
- public void DowngradeClient()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child");
- this.m_child = true;
- OnChildAgentStatus(this.m_child);
-
- }
-
- 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 (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(kill);
- }
-
- this.m_inventoryCache.ClientLeaving(this.AgentID, null);
-
-
- // m_world.RemoveViewerAgent(this);
-
- m_clientThreads.Remove(this.CircuitCode);
- m_networkServer.RemoveClientCircuit(this.CircuitCode);
- this.ClientThread.Abort();
- }
- #endregion
-
- # region Packet Handling
- public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)
- {
- bool result = false;
- lock (PacketHandlers)
- {
- if (!PacketHandlers.ContainsKey(packetType))
- {
- PacketHandlers.Add(packetType, handler);
- result = true;
- }
- }
- return result;
- }
-
- public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)
- {
- bool result = false;
- lock (m_packetHandlers)
- {
- if (!m_packetHandlers.ContainsKey(packetType))
- {
- m_packetHandlers.Add(packetType, handler);
- result = true;
- }
- }
- return result;
- }
-
- protected virtual bool ProcessPacketMethod(Packet packet)
- {
- bool result = false;
- bool found = false;
- PacketMethod method;
- if (m_packetHandlers.TryGetValue(packet.Type, out method))
- {
- //there is a local handler for this packet type
- result = method(this, packet);
- }
- else
- {
- //there is not a local handler so see if there is a Global handler
- lock (PacketHandlers)
- {
- found = PacketHandlers.TryGetValue(packet.Type, out method);
- }
- if (found)
- {
- result = method(this, packet);
- }
- }
- return result;
- }
-
- protected virtual void ClientLoop()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop");
- while (true)
- {
- QueItem nextPacket = PacketQueue.Dequeue();
- if (nextPacket.Incoming)
- {
- //is a incoming packet
- ProcessInPacket(nextPacket.Packet);
- }
- else
- {
- //is a out going packet
- ProcessOutPacket(nextPacket.Packet);
- }
- }
- }
- # endregion
-
- # region Setup
-
- protected virtual void InitNewClient()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
- this.m_world.AddNewAvatar(this, this.AgentID, false);
- }
-
- protected virtual void AuthUser()
- {
- // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
- AuthenticateResponse sessionInfo = this.m_authenticateSessionsHandler.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
- if (!sessionInfo.Authorised)
- {
- //session/circuit not authorised
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
- ClientThread.Abort();
- }
- else
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
- //session is authorised
- this.AgentID = cirpack.CircuitCode.ID;
- this.SessionID = cirpack.CircuitCode.SessionID;
- this.CircuitCode = cirpack.CircuitCode.Code;
- this.firstName = sessionInfo.LoginInfo.First;
- this.lastName = sessionInfo.LoginInfo.Last;
-
- if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
- {
- this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;
- }
- InitNewClient();
-
- ClientLoop();
- }
- }
- # endregion
-
-
- protected override void KillThread()
- {
- this.ClientThread.Abort();
- }
-
- #region Inventory Creation
- private void SetupInventory(AuthenticateResponse sessionInfo)
- {
-
- }
- private AgentInventory CreateInventory(LLUUID baseFolder)
- {
- AgentInventory inventory = null;
-
- return inventory;
- }
-
- private void CreateInventoryItem(CreateInventoryItemPacket packet)
- {
-
- }
- #endregion
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs
deleted file mode 100644
index facb3fa..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
-
-namespace OpenSim
-{
- public class ClientViewBase
- {
- protected BlockingQueue PacketQueue;
- protected Dictionary PendingAcks = new Dictionary();
- protected Dictionary NeedAck = new Dictionary();
-
- protected System.Timers.Timer AckTimer;
- protected uint Sequence = 0;
- protected object SequenceLock = new object();
- protected const int MAX_APPENDED_ACKS = 10;
- protected const int RESEND_TIMEOUT = 4000;
- protected const int MAX_SEQUENCE = 0xFFFFFF;
-
- public uint CircuitCode;
- public EndPoint userEP;
-
- protected PacketServer m_networkServer;
-
- public ClientViewBase()
- {
-
- }
-
- protected virtual void ProcessInPacket(Packet Pack)
- {
-
- }
-
- protected virtual void ProcessOutPacket(Packet Pack)
- {
- // Keep track of when this packet was sent out
- Pack.TickCount = Environment.TickCount;
-
- if (!Pack.Header.Resent)
- {
- // Set the sequence number
- lock (SequenceLock)
- {
- if (Sequence >= MAX_SEQUENCE)
- Sequence = 1;
- else
- Sequence++;
- Pack.Header.Sequence = Sequence;
- }
-
- if (Pack.Header.Reliable) //DIRTY HACK
- {
- lock (NeedAck)
- {
- if (!NeedAck.ContainsKey(Pack.Header.Sequence))
- {
- try
- {
- NeedAck.Add(Pack.Header.Sequence, Pack);
- }
- catch (Exception e) // HACKY
- {
- e.ToString();
- // Ignore
- // Seems to throw a exception here occasionally
- // of 'duplicate key' despite being locked.
- // !?!?!?
- }
- }
- else
- {
- // Client.Log("Attempted to add a duplicate sequence number (" +
- // packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
- // packet.Type.ToString(), Helpers.LogLevel.Warning);
- }
- }
-
- // Don't append ACKs to resent packets, in case that's what was causing the
- // delivery to fail
- if (!Pack.Header.Resent)
- {
- // Append any ACKs that need to be sent out to this packet
- lock (PendingAcks)
- {
- if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
- Pack.Type != PacketType.PacketAck &&
- Pack.Type != PacketType.LogoutRequest)
- {
- Pack.Header.AckList = new uint[PendingAcks.Count];
- int i = 0;
-
- foreach (uint ack in PendingAcks.Values)
- {
- Pack.Header.AckList[i] = ack;
- i++;
- }
-
- PendingAcks.Clear();
- Pack.Header.AppendedAcks = true;
- }
- }
- }
- }
- }
-
- byte[] ZeroOutBuffer = new byte[4096];
- byte[] sendbuffer;
- sendbuffer = Pack.ToBytes();
-
- try
- {
- if (Pack.Header.Zerocoded)
- {
- int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
- m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
- }
- else
- {
- m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
- }
- }
- catch (Exception)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
- this.KillThread();
- }
-
- }
-
- public virtual void InPacket(Packet NewPack)
- {
- // Handle appended ACKs
- if (NewPack.Header.AppendedAcks)
- {
- lock (NeedAck)
- {
- foreach (uint ack in NewPack.Header.AckList)
- {
- NeedAck.Remove(ack);
- }
- }
- }
-
- // Handle PacketAck packets
- if (NewPack.Type == PacketType.PacketAck)
- {
- PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
-
- lock (NeedAck)
- {
- foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
- {
- NeedAck.Remove(block.ID);
- }
- }
- }
- else if ((NewPack.Type == PacketType.StartPingCheck))
- {
- //reply to pingcheck
- libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
- libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
- endPing.PingID.PingID = startPing.PingID.PingID;
- OutPacket(endPing);
- }
- else
- {
- QueItem item = new QueItem();
- item.Packet = NewPack;
- item.Incoming = true;
- this.PacketQueue.Enqueue(item);
- }
-
- }
-
- public virtual void OutPacket(Packet NewPack)
- {
- QueItem item = new QueItem();
- item.Packet = NewPack;
- item.Incoming = false;
- this.PacketQueue.Enqueue(item);
- }
-
- # region Low Level Packet Methods
-
- protected void ack_pack(Packet Pack)
- {
- if (Pack.Header.Reliable)
- {
- libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
- ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
- ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
- ack_it.Packets[0].ID = Pack.Header.Sequence;
- ack_it.Header.Reliable = false;
-
- OutPacket(ack_it);
-
- }
- /*
- if (Pack.Header.Reliable)
- {
- lock (PendingAcks)
- {
- uint sequence = (uint)Pack.Header.Sequence;
- if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
- }
- }*/
- }
-
- protected void ResendUnacked()
- {
- int now = Environment.TickCount;
-
- lock (NeedAck)
- {
- foreach (Packet packet in NeedAck.Values)
- {
- if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " +
- (now - packet.TickCount) + "ms have passed");
-
- packet.Header.Resent = true;
- OutPacket(packet);
- }
- }
- }
- }
-
- protected void SendAcks()
- {
- lock (PendingAcks)
- {
- if (PendingAcks.Count > 0)
- {
- if (PendingAcks.Count > 250)
- {
- // FIXME: Handle the odd case where we have too many pending ACKs queued up
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!");
- return;
- }
-
- //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");
-
-
- int i = 0;
- PacketAckPacket acks = new PacketAckPacket();
- acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
-
- foreach (uint ack in PendingAcks.Values)
- {
- acks.Packets[i] = new PacketAckPacket.PacketsBlock();
- acks.Packets[i].ID = ack;
- i++;
- }
-
- acks.Header.Reliable = false;
- OutPacket(acks);
-
- PendingAcks.Clear();
- }
- }
- }
-
- protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
- {
- SendAcks();
- ResendUnacked();
- }
- #endregion
-
- protected virtual void KillThread()
- {
-
- }
-
- #region Nested Classes
-
- public class QueItem
- {
- public QueItem()
- {
- }
-
- public Packet Packet;
- public bool Incoming;
- }
- #endregion
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
new file mode 100644
index 0000000..facb3fa
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
@@ -0,0 +1,327 @@
+
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim
+{
+ public class ClientViewBase
+ {
+ protected BlockingQueue PacketQueue;
+ protected Dictionary PendingAcks = new Dictionary();
+ protected Dictionary NeedAck = new Dictionary();
+
+ protected System.Timers.Timer AckTimer;
+ protected uint Sequence = 0;
+ protected object SequenceLock = new object();
+ protected const int MAX_APPENDED_ACKS = 10;
+ protected const int RESEND_TIMEOUT = 4000;
+ protected const int MAX_SEQUENCE = 0xFFFFFF;
+
+ public uint CircuitCode;
+ public EndPoint userEP;
+
+ protected PacketServer m_networkServer;
+
+ public ClientViewBase()
+ {
+
+ }
+
+ protected virtual void ProcessInPacket(Packet Pack)
+ {
+
+ }
+
+ protected virtual void ProcessOutPacket(Packet Pack)
+ {
+ // Keep track of when this packet was sent out
+ Pack.TickCount = Environment.TickCount;
+
+ if (!Pack.Header.Resent)
+ {
+ // Set the sequence number
+ lock (SequenceLock)
+ {
+ if (Sequence >= MAX_SEQUENCE)
+ Sequence = 1;
+ else
+ Sequence++;
+ Pack.Header.Sequence = Sequence;
+ }
+
+ if (Pack.Header.Reliable) //DIRTY HACK
+ {
+ lock (NeedAck)
+ {
+ if (!NeedAck.ContainsKey(Pack.Header.Sequence))
+ {
+ try
+ {
+ NeedAck.Add(Pack.Header.Sequence, Pack);
+ }
+ catch (Exception e) // HACKY
+ {
+ e.ToString();
+ // Ignore
+ // Seems to throw a exception here occasionally
+ // of 'duplicate key' despite being locked.
+ // !?!?!?
+ }
+ }
+ else
+ {
+ // Client.Log("Attempted to add a duplicate sequence number (" +
+ // packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
+ // packet.Type.ToString(), Helpers.LogLevel.Warning);
+ }
+ }
+
+ // Don't append ACKs to resent packets, in case that's what was causing the
+ // delivery to fail
+ if (!Pack.Header.Resent)
+ {
+ // Append any ACKs that need to be sent out to this packet
+ lock (PendingAcks)
+ {
+ if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
+ Pack.Type != PacketType.PacketAck &&
+ Pack.Type != PacketType.LogoutRequest)
+ {
+ Pack.Header.AckList = new uint[PendingAcks.Count];
+ int i = 0;
+
+ foreach (uint ack in PendingAcks.Values)
+ {
+ Pack.Header.AckList[i] = ack;
+ i++;
+ }
+
+ PendingAcks.Clear();
+ Pack.Header.AppendedAcks = true;
+ }
+ }
+ }
+ }
+ }
+
+ byte[] ZeroOutBuffer = new byte[4096];
+ byte[] sendbuffer;
+ sendbuffer = Pack.ToBytes();
+
+ try
+ {
+ if (Pack.Header.Zerocoded)
+ {
+ int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
+ m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
+ }
+ else
+ {
+ m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
+ }
+ }
+ catch (Exception)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
+ this.KillThread();
+ }
+
+ }
+
+ public virtual void InPacket(Packet NewPack)
+ {
+ // Handle appended ACKs
+ if (NewPack.Header.AppendedAcks)
+ {
+ lock (NeedAck)
+ {
+ foreach (uint ack in NewPack.Header.AckList)
+ {
+ NeedAck.Remove(ack);
+ }
+ }
+ }
+
+ // Handle PacketAck packets
+ if (NewPack.Type == PacketType.PacketAck)
+ {
+ PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
+
+ lock (NeedAck)
+ {
+ foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
+ {
+ NeedAck.Remove(block.ID);
+ }
+ }
+ }
+ else if ((NewPack.Type == PacketType.StartPingCheck))
+ {
+ //reply to pingcheck
+ libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
+ libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
+ endPing.PingID.PingID = startPing.PingID.PingID;
+ OutPacket(endPing);
+ }
+ else
+ {
+ QueItem item = new QueItem();
+ item.Packet = NewPack;
+ item.Incoming = true;
+ this.PacketQueue.Enqueue(item);
+ }
+
+ }
+
+ public virtual void OutPacket(Packet NewPack)
+ {
+ QueItem item = new QueItem();
+ item.Packet = NewPack;
+ item.Incoming = false;
+ this.PacketQueue.Enqueue(item);
+ }
+
+ # region Low Level Packet Methods
+
+ protected void ack_pack(Packet Pack)
+ {
+ if (Pack.Header.Reliable)
+ {
+ libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
+ ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
+ ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
+ ack_it.Packets[0].ID = Pack.Header.Sequence;
+ ack_it.Header.Reliable = false;
+
+ OutPacket(ack_it);
+
+ }
+ /*
+ if (Pack.Header.Reliable)
+ {
+ lock (PendingAcks)
+ {
+ uint sequence = (uint)Pack.Header.Sequence;
+ if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
+ }
+ }*/
+ }
+
+ protected void ResendUnacked()
+ {
+ int now = Environment.TickCount;
+
+ lock (NeedAck)
+ {
+ foreach (Packet packet in NeedAck.Values)
+ {
+ if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " +
+ (now - packet.TickCount) + "ms have passed");
+
+ packet.Header.Resent = true;
+ OutPacket(packet);
+ }
+ }
+ }
+ }
+
+ protected void SendAcks()
+ {
+ lock (PendingAcks)
+ {
+ if (PendingAcks.Count > 0)
+ {
+ if (PendingAcks.Count > 250)
+ {
+ // FIXME: Handle the odd case where we have too many pending ACKs queued up
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!");
+ return;
+ }
+
+ //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");
+
+
+ int i = 0;
+ PacketAckPacket acks = new PacketAckPacket();
+ acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
+
+ foreach (uint ack in PendingAcks.Values)
+ {
+ acks.Packets[i] = new PacketAckPacket.PacketsBlock();
+ acks.Packets[i].ID = ack;
+ i++;
+ }
+
+ acks.Header.Reliable = false;
+ OutPacket(acks);
+
+ PendingAcks.Clear();
+ }
+ }
+ }
+
+ protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
+ {
+ SendAcks();
+ ResendUnacked();
+ }
+ #endregion
+
+ protected virtual void KillThread()
+ {
+
+ }
+
+ #region Nested Classes
+
+ public class QueItem
+ {
+ public QueItem()
+ {
+ }
+
+ public Packet Packet;
+ public bool Incoming;
+ }
+ #endregion
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index c71e60c..5c726bd 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -130,46 +130,46 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 10e3422..87c5b22 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,6 +11,12 @@
+
+
+
+
+
+
@@ -19,12 +25,6 @@
-
-
-
-
-
-
--
cgit v1.1