From 646bbbc84b8010e0dacbeed5342cdb045f46cc49 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 27 Jun 2007 15:28:52 +0000
Subject: Some work on restructuring the namespaces / project names. Note this
doesn't compile yet as not all the code has been changed to use the new
namespaces. Am committing it now for feedback on the namespaces.
---
.../Region/ClientStack/Assets/InventoryCache.cs | 337 +++++++
.../ClientStack/ClientStackNetworkHandler.cs | 46 +
OpenSim/Region/ClientStack/ClientView.API.cs | 975 +++++++++++++++++++++
.../ClientStack/ClientView.AgentAssetUpload.cs | 358 ++++++++
.../ClientStack/ClientView.PacketHandlers.cs | 198 +++++
.../ClientStack/ClientView.ProcessPackets.cs | 550 ++++++++++++
OpenSim/Region/ClientStack/ClientView.cs | 273 ++++++
OpenSim/Region/ClientStack/ClientViewBase.cs | 327 +++++++
.../ClientStack/OpenSim.Region.ClientStack.csproj | 173 ++++
.../OpenSim.Region.ClientStack.csproj.user | 12 +
OpenSim/Region/ClientStack/PacketServer.cs | 183 ++++
.../Region/ClientStack/RegionApplicationBase.cs | 129 +++
OpenSim/Region/ClientStack/UDPServer.cs | 208 +++++
OpenSim/Region/ClientStack/VersionInfo.cs | 38 +
14 files changed, 3807 insertions(+)
create mode 100644 OpenSim/Region/ClientStack/Assets/InventoryCache.cs
create mode 100644 OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
create mode 100644 OpenSim/Region/ClientStack/ClientView.API.cs
create mode 100644 OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
create mode 100644 OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
create mode 100644 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
create mode 100644 OpenSim/Region/ClientStack/ClientView.cs
create mode 100644 OpenSim/Region/ClientStack/ClientViewBase.cs
create mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
create mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
create mode 100644 OpenSim/Region/ClientStack/PacketServer.cs
create mode 100644 OpenSim/Region/ClientStack/RegionApplicationBase.cs
create mode 100644 OpenSim/Region/ClientStack/UDPServer.cs
create mode 100644 OpenSim/Region/ClientStack/VersionInfo.cs
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
new file mode 100644
index 0000000..5d5021c
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -0,0 +1,337 @@
+/*
+* 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 libsecondlife;
+using OpenSim;
+using libsecondlife.Packets;
+//using OpenSim.GridServers;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.Assets
+{
+ ///
+ /// Description of InventoryManager.
+ ///
+ public class InventoryCache
+ {
+ private Dictionary _agentsInventory;
+ private List _serverRequests; //list of requests made to user server.
+ private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ private const uint FULL_MASK_PERMISSIONS = 2147483647;
+
+ public InventoryCache()
+ {
+ _agentsInventory = new Dictionary();
+ _serverRequests = new List();
+ }
+
+ public void AddNewAgentsInventory(AgentInventory agentInventory)
+ {
+ if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))
+ {
+ this._agentsInventory.Add(agentInventory.AgentID, agentInventory);
+ }
+ }
+
+ public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver)
+ {
+ AgentInventory res = null;
+ if (!this._agentsInventory.ContainsKey(agentID))
+ {
+ res = userserver.RequestAgentsInventory(agentID);
+ this._agentsInventory.Add(agentID,res);
+ }
+ return res;
+ }
+
+ public AgentInventory GetAgentsInventory(LLUUID agentID)
+ {
+ if (this._agentsInventory.ContainsKey(agentID))
+ {
+ return this._agentsInventory[agentID];
+ }
+
+ return null;
+ }
+
+ public void ClientLeaving(LLUUID clientID, IUserServer userserver)
+ {
+ if (this._agentsInventory.ContainsKey(clientID))
+ {
+ if (userserver != null)
+ {
+ userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]);
+ }
+ this._agentsInventory.Remove(clientID);
+ }
+ }
+
+ public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)
+ {
+ return this.CreateNewInventoryFolder(remoteClient, folderID, 0);
+ }
+
+ public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)
+ {
+ bool res = false;
+ if (folderID != LLUUID.Zero) //don't create a folder with a zero id
+ {
+ if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+ {
+ res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);
+ }
+ }
+ return res;
+ }
+
+ public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
+ {
+ bool res = false;
+ if (folderID != LLUUID.Zero) //don't create a folder with a zero id
+ {
+ if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+ {
+ res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
+ }
+ }
+ return res;
+ }
+
+ public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
+ {
+ LLUUID newItem = null;
+ if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+ {
+ newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);
+ if (newItem != null)
+ {
+ InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];
+ this.SendItemUpdateCreate(remoteClient, Item);
+ }
+ }
+
+ return newItem;
+ }
+ public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)
+ {
+ bool res = false;
+ if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+ {
+ res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
+ if (res)
+ {
+ RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
+ remove.AgentData.AgentID = remoteClient.AgentID;
+ remove.AgentData.SessionID = remoteClient.SessionID;
+ remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
+ remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
+ remove.InventoryData[0].ItemID = itemID;
+ remoteClient.OutPacket(remove);
+ }
+ }
+
+ return res;
+ }
+
+ public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
+ {
+ if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+ {
+ bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
+ if (res)
+ {
+ InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
+ this.SendItemUpdateCreate(remoteClient, Item);
+ }
+ return res;
+ }
+
+ return false;
+ }
+
+ public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
+ {
+ if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+ {
+ bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
+ if (res)
+ {
+ InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
+ this.SendItemUpdateCreate(remoteClient, Item);
+ }
+ return res;
+ }
+
+ return false;
+ }
+
+ public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)
+ {
+ if (this._agentsInventory.ContainsKey(userInfo.AgentID))
+ {
+ AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
+ if (FetchDescend.InventoryData.FetchItems)
+ {
+ if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))
+ {
+ InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];
+ InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
+ Descend.AgentData.AgentID = userInfo.AgentID;
+ Descend.AgentData.OwnerID = Folder.OwnerID;
+ Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
+ Descend.AgentData.Descendents = Folder.Items.Count;
+ Descend.AgentData.Version = Folder.Items.Count;
+
+
+ Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
+ for (int i = 0; i < Folder.Items.Count; i++)
+ {
+
+ InventoryItem Item = Folder.Items[i];
+ Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
+ Descend.ItemData[i].ItemID = Item.ItemID;
+ Descend.ItemData[i].AssetID = Item.AssetID;
+ Descend.ItemData[i].CreatorID = Item.CreatorID;
+ Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
+ Descend.ItemData[i].CreationDate = 1000;
+ Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");
+ Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
+ Descend.ItemData[i].Flags = 1;
+ Descend.ItemData[i].FolderID = Item.FolderID;
+ Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+ Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
+ Descend.ItemData[i].InvType = Item.InvType;
+ Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");
+ Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
+ Descend.ItemData[i].OwnerID = Item.OwnerID;
+ Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
+ Descend.ItemData[i].SalePrice = 100;
+ Descend.ItemData[i].SaleType = 0;
+ Descend.ItemData[i].Type = Item.Type;
+ Descend.ItemData[i].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ }
+
+ userInfo.OutPacket(Descend);
+
+ }
+ }
+ else
+ {
+ Console.WriteLine("fetch subfolders");
+ }
+ }
+ }
+
+ public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)
+ {
+ if (this._agentsInventory.ContainsKey(userInfo.AgentID))
+ {
+ AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
+
+ for (int i = 0; i < FetchItems.InventoryData.Length; i++)
+ {
+ if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))
+ {
+ InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];
+ FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
+ InventoryReply.AgentData.AgentID = userInfo.AgentID;
+ InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
+ InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
+ InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+ InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+ InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+ InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+ InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
+ InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].Flags = 0;
+ InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+ InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+ InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].InvType = Item.InvType;
+ InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
+ InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+ InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].SalePrice = 100;
+ InventoryReply.InventoryData[0].SaleType = 0;
+ InventoryReply.InventoryData[0].Type = Item.Type;
+ InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ userInfo.OutPacket(InventoryReply);
+ }
+ }
+ }
+ }
+
+ private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)
+ {
+
+ UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
+ InventoryReply.AgentData.AgentID = remoteClient.AgentID;
+ InventoryReply.AgentData.SimApproved = true;
+ InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
+ InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
+ InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+ InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+ InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+ InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].CreationDate = 1000;
+ InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
+ InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].Flags = 0;
+ InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+ InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+ InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].InvType = Item.InvType;
+ InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
+ InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+ InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+ InventoryReply.InventoryData[0].SalePrice = 100;
+ InventoryReply.InventoryData[0].SaleType = 0;
+ InventoryReply.InventoryData[0].Type = Item.Type;
+ InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+
+ remoteClient.OutPacket(InventoryReply);
+ }
+ }
+
+
+
+ public class UserServerRequest
+ {
+ public UserServerRequest()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
new file mode 100644
index 0000000..7552195
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -0,0 +1,46 @@
+/*
+* 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 System.Net;
+using System.Net.Sockets;
+using libsecondlife;
+
+
+namespace OpenSim
+{
+
+ public interface ClientStackNetworkHandler
+ {
+ void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode);// EndPoint packetSender);
+ void RemoveClientCircuit(uint circuitcode);
+ void RegisterPacketServer(PacketServer server);
+ }
+
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
new file mode 100644
index 0000000..902f3c7
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -0,0 +1,975 @@
+/*
+* 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 UpdateAgent OnAgentUpdate;
+ public event StartAnim OnStartAnim;
+ public event GenericCall OnRequestAvatarsData;
+ public event LinkObjects OnLinkObjects;
+ public event UpdateVector OnGrapObject;
+ public event ObjectSelect OnDeGrapObject;
+ public event MoveObject OnGrapUpdate;
+ public event GenericCall4 OnAddPrim;
+ public event UpdateShape OnUpdatePrimShape;
+ public event ObjectSelect OnObjectSelect;
+ public event UpdatePrimFlags OnUpdatePrimFlags;
+ public event UpdatePrimTexture OnUpdatePrimTexture;
+ public event UpdateVector OnUpdatePrimPosition;
+ public event UpdatePrimRotation OnUpdatePrimRotation;
+ public event UpdateVector OnUpdatePrimScale;
+ public event StatusChange OnChildAgentStatus;
+ public event GenericCall2 OnStopMovement;
+ public event NewAvatar OnNewAvatar;
+ public event GenericCall6 OnRemoveAvatar;
+ public event RequestMapBlocks OnRequestMapBlocks;
+ public event TeleportLocationRequest OnTeleportLocationRequest;
+
+ 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.RegionName + "\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, LLVector3 pos, LLVector3 look)
+ {
+ AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
+ mov.AgentData.SessionID = this.SessionID;
+ mov.AgentData.AgentID = this.AgentID;
+ mov.Data.RegionHandle = regInfo.RegionHandle;
+ mov.Data.Timestamp = 1172750370; // TODO - dynamicalise this
+
+ if ((pos.X == 0) && (pos.Y == 0) && (pos.Z == 0))
+ {
+ mov.Data.Position = this.startpos;
+ }
+ else
+ {
+ mov.Data.Position = pos;
+ }
+ mov.Data.LookAt = look;
+
+ 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.MainLog.Instance.Warn("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.MainLog.Instance.Warn("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;
+ }
+
+ public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort)
+ {
+ LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);
+
+ CrossedRegionPacket newSimPack = new CrossedRegionPacket();
+ newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
+ newSimPack.AgentData.AgentID = this.AgentID;
+ newSimPack.AgentData.SessionID = this.SessionID;
+ newSimPack.Info = new CrossedRegionPacket.InfoBlock();
+ newSimPack.Info.Position = pos;
+ newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
+ newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
+ newSimPack.RegionData.RegionHandle = newRegionHandle;
+ byte[] byteIP = newRegionIP.GetAddressBytes();
+ newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
+ newSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;
+ newSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
+ newSimPack.RegionData.SimIP += (uint)byteIP[0];
+ newSimPack.RegionData.SimPort = newRegionPort;
+ newSimPack.RegionData.SeedCapability = new byte[0];
+
+ this.OutPacket(newSimPack);
+ //this.DowngradeClient();
+ }
+
+ public void SendMapBlock(List mapBlocks)
+ {
+ System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+
+ MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
+ mapReply.AgentData.AgentID = this.AgentID;
+ mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks.Count];
+ mapReply.AgentData.Flags = 0;
+
+ for (int i = 0; i < mapBlocks.Count; i++)
+ {
+ mapReply.Data[i] = new MapBlockReplyPacket.DataBlock();
+ mapReply.Data[i].MapImageID = mapBlocks[i].MapImageId;
+ mapReply.Data[i].X = mapBlocks[i].X;
+ mapReply.Data[i].Y = mapBlocks[i].Y;
+ mapReply.Data[i].WaterHeight = mapBlocks[i].WaterHeight;
+ mapReply.Data[i].Name = _enc.GetBytes(mapBlocks[i].Name);
+ mapReply.Data[i].RegionFlags = mapBlocks[i].RegionFlags;
+ mapReply.Data[i].Access = mapBlocks[i].Access;
+ mapReply.Data[i].Agents = mapBlocks[i].Agents;
+ }
+ this.OutPacket(mapReply);
+ }
+
+ public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags)
+ {
+ TeleportLocalPacket tpLocal = new TeleportLocalPacket();
+ tpLocal.Info.AgentID = this.AgentID;
+ tpLocal.Info.TeleportFlags = flags;
+ tpLocal.Info.LocationID = 2;
+ tpLocal.Info.LookAt = lookAt;
+ tpLocal.Info.Position = position;
+ OutPacket(tpLocal);
+ }
+
+ public void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags)
+ {
+ TeleportFinishPacket teleport = new TeleportFinishPacket();
+ teleport.Info.AgentID = this.AgentID;
+ teleport.Info.RegionHandle = regionHandle;
+ teleport.Info.SimAccess = simAccess;
+ teleport.Info.SeedCapability = new byte[0];
+
+ System.Net.IPAddress oIP = System.Net.IPAddress.Parse(ipAddress);
+ byte[] byteIP = oIP.GetAddressBytes();
+ uint ip = (uint)byteIP[3] << 24;
+ ip += (uint)byteIP[2] << 16;
+ ip += (uint)byteIP[1] << 8;
+ ip += (uint)byteIP[0];
+
+ teleport.Info.SimIP = ip;
+ teleport.Info.SimPort = ipPort;
+ teleport.Info.LocationID = 4;
+ teleport.Info.TeleportFlags = 1 << 4;
+ OutPacket(teleport);
+ }
+
+ ///
+ ///
+ ///
+ public void SendTeleportCancel()
+ {
+ TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+ tpCancel.Info.SessionID = this.SessionID;
+ tpCancel.Info.AgentID = this.AgentID;
+
+ OutPacket(tpCancel);
+ }
+
+ ///
+ ///
+ ///
+ public void SendTeleportLocationStart()
+ {
+ TeleportStartPacket tpStart = new TeleportStartPacket();
+ tpStart.Info.TeleportFlags = 16; // Teleport via location
+ OutPacket(tpStart);
+ }
+
+ public void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance)
+ {
+ MoneyBalanceReplyPacket money = new MoneyBalanceReplyPacket();
+ money.MoneyData.AgentID = this.AgentID;
+ money.MoneyData.TransactionID = transaction;
+ money.MoneyData.TransactionSuccess = success;
+ money.MoneyData.Description = description;
+ money.MoneyData.MoneyBalance = balance;
+ OutPacket(money);
+ }
+
+ #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(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
+ {
+ 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 = regionHandle;
+ objupdate.RegionData.TimeDilation = 64096;
+ objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
+ objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
+ //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);
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity)
+ {
+ ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = this.CreateAvatarImprovedBlock(localID, position, velocity);
+ ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
+ terse.RegionData.RegionHandle = regionHandle;
+ terse.RegionData.TimeDilation = timeDilation;
+ terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+ terse.ObjectData[0] = terseBlock;
+
+ this.OutPacket(terse);
+ }
+
+ #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, uint flags)
+ {
+ 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, flags);
+ 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 , uint flags)
+ {
+ 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, flags);
+ 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);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ 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);
+ }
+
+ #endregion
+
+ #endregion
+
+ #region Helper Methods
+
+ protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateAvatarImprovedBlock(uint localID, LLVector3 pos, LLVector3 velocity)
+ {
+ byte[] bytes = new byte[60];
+ int i = 0;
+ ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+
+ dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;
+
+ uint ID = localID;
+
+ 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++] = 1;
+ i += 14;
+ bytes[i++] = 128;
+ bytes[i++] = 63;
+
+ byte[] pb = pos.GetBytes();
+ Array.Copy(pb, 0, bytes, i, pb.Length);
+ i += 12;
+ ushort InternVelocityX;
+ ushort InternVelocityY;
+ ushort InternVelocityZ;
+ Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
+
+ internDirec = new Axiom.MathLib.Vector3(velocity.X, velocity.Y, velocity.Z);
+
+ internDirec = internDirec / 128.0f;
+ internDirec.x += 1;
+ internDirec.y += 1;
+ internDirec.z += 1;
+
+ InternVelocityX = (ushort)(32768 * internDirec.x);
+ InternVelocityY = (ushort)(32768 * internDirec.y);
+ InternVelocityZ = (ushort)(32768 * internDirec.z);
+
+ ushort ac = 32767;
+ bytes[i++] = (byte)(InternVelocityX % 256);
+ bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
+ bytes[i++] = (byte)(InternVelocityY % 256);
+ bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
+ bytes[i++] = (byte)(InternVelocityZ % 256);
+ bytes[i++] = (byte)((InternVelocityZ >> 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);
+
+ //rot
+ 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);
+ bytes[i++] = (byte)(ac % 256);
+ bytes[i++] = (byte)((ac >> 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);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ 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;
+ }
+
+
+ ///
+ /// Create the ObjectDataBlock for a ObjectUpdatePacket (for a Primitive)
+ ///
+ ///
+ ///
+ protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID, uint flags)
+ {
+ ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+ this.SetDefaultPrimPacketValues(objupdate);
+ objupdate.UpdateFlags = flags;
+ this.SetPrimPacketShapeData(objupdate, primData, textureID);
+
+ return objupdate;
+ }
+
+ ///
+ /// 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;
+ }
+
+ ///
+ /// 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;
+ }
+
+
+ ///
+ ///
+ ///
+ ///
+ protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
+ {
+ 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;
+ if (textureEntry != null)
+ {
+ objdata.TextureEntry = textureEntry;
+ }
+ 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;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ 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 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;
+ }
+ #endregion
+
+ }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
new file mode 100644
index 0000000..914c38a
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -0,0 +1,358 @@
+/*
+* 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.Interfaces;
+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()
+ {
+
+ }
+ }
+
+ //new class , not currently used.
+ public class AssetXferUploader
+ {
+ private IClientAPI ourClient;
+
+ public bool UploadComplete = false;
+
+ public bool AddToInventory;
+ public LLUUID InventFolder = LLUUID.Zero;
+
+ public uint XferID;
+ public AssetBase Asset;
+ public LLUUID TransactionID = LLUUID.Zero;
+
+
+ public AssetXferUploader(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data)
+ {
+ ourClient = remoteClient;
+ Asset = new AssetBase();
+ Asset.FullID = assetID;
+ Asset.InvType = type;
+ Asset.Type = type;
+ Asset.Data = data;
+ Asset.Name = "blank";
+ Asset.Description = "empty";
+ TransactionID = transaction;
+
+ if (Asset.Data.Length > 2)
+ {
+ //data block should only have data in it, if there is no more data to be uploaded
+ this.SendCompleteMessage();
+ }
+ else
+ {
+ this.ReqestStartXfer();
+ }
+ }
+
+ protected void SendCompleteMessage()
+ {
+ UploadComplete = true;
+ AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+ response.AssetBlock.Type = Asset.Type;
+ response.AssetBlock.Success = true;
+ response.AssetBlock.UUID = Asset.FullID;
+ this.ourClient.OutPacket(response);
+
+ //TODO trigger event
+ }
+
+ protected void ReqestStartXfer()
+ {
+ UploadComplete = false;
+ XferID = Util.GetNextXferID();
+ RequestXferPacket xfer = new RequestXferPacket();
+ xfer.XferID.ID = XferID;
+ xfer.XferID.VFileType = Asset.Type;
+ xfer.XferID.VFileID = Asset.FullID;
+ xfer.XferID.FilePath = 0;
+ xfer.XferID.Filename = new byte[0];
+ this.ourClient.OutPacket(xfer);
+ }
+
+ public void HandleXferPacket(uint xferID, uint packetID, byte[] data)
+ {
+ if (XferID == xferID)
+ {
+ if (Asset.Data.Length > 1)
+ {
+ byte[] newArray = new byte[Asset.Data.Length + data.Length];
+ Array.Copy(Asset.Data, 0, newArray, 0, Asset.Data.Length);
+ Array.Copy(data, 0, newArray, Asset.Data.Length, data.Length);
+ Asset.Data = newArray;
+ }
+ else
+ {
+ byte[] newArray = new byte[data.Length - 4];
+ Array.Copy(data, 4, newArray, 0, data.Length - 4);
+ Asset.Data = newArray;
+ }
+
+ ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
+ confirmXfer.XferID.ID = xferID;
+ confirmXfer.XferID.Packet = packetID;
+ this.ourClient.OutPacket(confirmXfer);
+
+ if ((packetID & 2147483648) != 0)
+ {
+ this.SendCompleteMessage();
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
new file mode 100644
index 0000000..32aed02
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -0,0 +1,198 @@
+/*
+* 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.MainLog.Instance.Verbose( "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 = 0;
+ mapReply.LayerData[0].Left = 0;
+ mapReply.LayerData[0].Top = 30000;
+ mapReply.LayerData[0].Right = 30000;
+ 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);
+ */
+ }
+
+
+ }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
new file mode 100644
index 0000000..191ef21
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -0,0 +1,550 @@
+/*
+* 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.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize,
+ 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 (OnCompleteMovementToRegion != null)
+ {
+ OnCompleteMovementToRegion();
+ }
+ break;
+ case PacketType.AgentUpdate:
+ if (OnAgentUpdate != null)
+ {
+ AgentUpdatePacket agenUpdate = (AgentUpdatePacket) Pack;
+ OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation );
+ }
+ 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.MainLog.Instance.Verbose( 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;
+ case PacketType.ObjectGrab:
+ ObjectGrabPacket grap = (ObjectGrabPacket)Pack;
+ if (OnGrapObject != null)
+ {
+ OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this);
+ }
+ break;
+ case PacketType.ObjectGrabUpdate:
+ ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack;
+ if (OnGrapUpdate != null)
+ {
+ OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this);
+ }
+ break;
+ case PacketType.ObjectDeGrab:
+ ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack;
+ if (OnDeGrapObject != null)
+ {
+ OnDeGrapObject(deGrap.ObjectData.LocalID, 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;
+ if (OnRequestMapBlocks != null)
+ {
+ OnRequestMapBlocks(this, 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());
+
+ if (OnTeleportLocationRequest != null)
+ {
+ OnTeleportLocationRequest(this, tpLocReq.Info.RegionHandle, tpLocReq.Info.Position, tpLocReq.Info.LookAt, 16);
+ }
+ else
+ {
+ //no event handler so cancel request
+ TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+ tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
+ tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
+ OutPacket(tpCancel);
+ }
+ break;
+ #endregion
+
+ case PacketType.MoneyBalanceRequest:
+ this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
+ break;
+
+ #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.MainLog.Instance.Verbose( Pack.ToString());
+ break;
+ #endregion
+ }
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
new file mode 100644
index 0000000..312da9d
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -0,0 +1,273 @@
+/*
+* 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 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.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
+ cirpack = initialcirpack;
+ userEP = remoteEP;
+
+ 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 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.RemoveClient(this.AgentId);
+
+ 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.MainLog.Instance.Verbose( "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.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
+ this.m_world.AddNewClient(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.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+ ClientThread.Abort();
+ }
+ else
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Notice("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/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
new file mode 100644
index 0000000..8b503f0
--- /dev/null
+++ b/OpenSim/Region/ClientStack/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.MainLog.Instance.Warn("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.MainLog.Instance.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.MainLog.Instance.Verbose( "Too many ACKs queued up!");
+ return;
+ }
+
+ //OpenSim.Framework.Console.MainLog.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/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
new file mode 100644
index 0000000..0b19359
--- /dev/null
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -0,0 +1,173 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {DC3698B2-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Region.ClientStack
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Region.ClientStack
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ ..\..\..\bin\Axiom.MathLib.dll
+ False
+
+
+ ..\..\..\bin\Db4objects.Db4o.dll
+ False
+
+
+ ..\..\..\bin\libsecondlife.dll
+ False
+
+
+ OpenSim.FrameworkGenericConfig.Xml.dll
+ False
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Console
+ {A7CD0630-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Terrain.BasicTerrain
+ {C9E0F891-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
@@ -0,0 +1,12 @@
+
+
+ Debug
+ AnyCPU
+ C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\
+ 8.0.50727
+ ProjectFiles
+ 0
+
+
+
+
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
new file mode 100644
index 0000000..229570c
--- /dev/null
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -0,0 +1,183 @@
+/*
+* 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 libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework;
+using System.Net;
+using System.Net.Sockets;
+using OpenSim.Assets;
+using OpenSim.Caches;
+
+namespace OpenSim
+{
+ public class PacketServer
+ {
+ private ClientStackNetworkHandler _networkHandler;
+ private IWorld _localWorld;
+ public Dictionary ClientThreads = new Dictionary();
+ public Dictionary ClientAPIs = new Dictionary();
+ protected uint serverPort;
+
+ public PacketServer(ClientStackNetworkHandler networkHandler, uint port)
+ {
+ _networkHandler = networkHandler;
+ this.serverPort = port;
+ _networkHandler.RegisterPacketServer(this);
+ }
+
+ public IWorld LocalWorld
+ {
+ set
+ {
+ this._localWorld = value;
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public virtual void ClientInPacket(uint circuitCode, Packet packet)
+ {
+ if (this.ClientThreads.ContainsKey(circuitCode))
+ {
+ ClientThreads[circuitCode].InPacket(packet);
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public virtual bool AddNewCircuitCodeClient(uint circuitCode)
+ {
+ return false;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public virtual void SendPacketToAllClients(Packet packet)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public virtual void SendPacketToAllExcept(Packet packet, ClientView simClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public virtual void AddClientPacketHandler(PacketType packetType, PacketMethod handler)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ public virtual void RegisterClientPacketHandlers()
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
+ {
+ return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)
+ {
+ ClientView newuser =
+ CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,
+ authenticateSessionsClass);
+
+ this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
+ this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
+
+ return true;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
+ {
+ this._networkHandler.SendPacketTo(buffer, size, flags, circuitcode);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public virtual void RemoveClientCircuit(uint circuitcode)
+ {
+ this._networkHandler.RemoveClientCircuit(circuitcode);
+ }
+ }
+}
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
new file mode 100644
index 0000000..b421fbd
--- /dev/null
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -0,0 +1,129 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Assets;
+using OpenSim.Caches;
+using OpenSim.Framework.Console;
+using OpenSim.Physics.Manager;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.GenericConfig;
+
+namespace OpenSim
+{
+ public class RegionApplicationBase
+ {
+ protected IGenericConfig localConfig;
+ protected PhysicsManager physManager;
+ protected AssetCache AssetCache;
+ protected InventoryCache InventoryCache;
+ protected Dictionary clientCircuits = new Dictionary();
+ protected DateTime startuptime;
+ protected NetworkServersInfo serversData;
+
+ public string m_physicsEngine;
+ public bool m_sandbox = false;
+ public bool m_loginserver;
+ public bool user_accounts = false;
+ public bool gridLocalAsset = false;
+ protected bool configFileSetup = false;
+ public string m_config;
+
+ protected List m_udpServer = new List();
+ protected List regionData = new List();
+ protected List m_localWorld = new List();
+ protected BaseHttpServer httpServer;
+ protected List AuthenticateSessionsHandler = new List();
+
+ protected LogBase m_log;
+
+ public RegionApplicationBase()
+ {
+
+ }
+
+ public RegionApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
+ {
+ this.configFileSetup = useConfigFile;
+ m_sandbox = sandBoxMode;
+ m_loginserver = startLoginServer;
+ m_physicsEngine = physicsEngine;
+ m_config = configFile;
+ }
+
+ /*protected World m_localWorld;
+ public World LocalWorld
+ {
+ get { return m_localWorld; }
+ }*/
+
+ ///
+ /// Performs initialisation of the world, such as loading configuration from disk.
+ ///
+ public virtual void StartUp()
+ {
+ }
+
+ protected virtual void SetupLocalGridServers()
+ {
+ }
+
+ protected virtual void SetupRemoteGridServers()
+ {
+
+ }
+
+ protected virtual void SetupWorld()
+ {
+ }
+
+ protected virtual void SetupHttpListener()
+ {
+ }
+
+ protected virtual void ConnectToRemoteGridServer()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
new file mode 100644
index 0000000..f2a02d9
--- /dev/null
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -0,0 +1,208 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Assets;
+using OpenSim.Caches;
+using OpenSim.Framework.Console;
+using OpenSim.Framework;
+using Nwc.XmlRpc;
+using OpenSim.Servers;
+using OpenSim.GenericConfig;
+
+namespace OpenSim
+{
+
+ public class UDPServer : ClientStackNetworkHandler
+ {
+ protected Dictionary clientCircuits = new Dictionary();
+ public Socket Server;
+ protected IPEndPoint ServerIncoming;
+ protected byte[] RecvBuffer = new byte[4096];
+ protected byte[] ZeroBuffer = new byte[8192];
+ protected IPEndPoint ipeSender;
+ protected EndPoint epSender;
+ protected AsyncCallback ReceivedData;
+ protected PacketServer _packetServer;
+
+ protected int listenPort;
+ protected IWorld m_localWorld;
+ protected AssetCache m_assetCache;
+ protected InventoryCache m_inventoryCache;
+ protected LogBase m_log;
+ protected AuthenticateSessionsBase m_authenticateSessionsClass;
+
+ public PacketServer PacketServer
+ {
+ get
+ {
+ return _packetServer;
+ }
+ set
+ {
+ _packetServer = value;
+ }
+ }
+
+ public IWorld LocalWorld
+ {
+ set
+ {
+ this.m_localWorld = value;
+ this._packetServer.LocalWorld = this.m_localWorld;
+ }
+ }
+
+ public UDPServer()
+ {
+ }
+
+ public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AuthenticateSessionsBase authenticateClass)
+ {
+ listenPort = port;
+ this.m_assetCache = assetCache;
+ this.m_inventoryCache = inventoryCache;
+ this.m_log = console;
+ this.m_authenticateSessionsClass = authenticateClass;
+ this.CreatePacketServer();
+
+ }
+
+ protected virtual void CreatePacketServer()
+ {
+ PacketServer packetServer = new PacketServer(this, (uint) listenPort);
+ }
+
+ protected virtual void OnReceivedData(IAsyncResult result)
+ {
+ ipeSender = new IPEndPoint(IPAddress.Any, 0);
+ epSender = (EndPoint)ipeSender;
+ Packet packet = null;
+ int numBytes = Server.EndReceiveFrom(result, ref epSender);
+ int packetEnd = numBytes - 1;
+
+ packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+ // do we already have a circuit for this endpoint
+ if (this.clientCircuits.ContainsKey(epSender))
+ {
+ //if so then send packet to the packetserver
+ this._packetServer.ClientInPacket(this.clientCircuits[epSender], packet);
+ }
+ else if (packet.Type == PacketType.UseCircuitCode)
+ {
+ // new client
+ this.AddNewClient(packet);
+ }
+ else
+ { // invalid client
+ m_log.Warn("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
+ }
+
+ Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+ }
+
+ protected virtual void AddNewClient(Packet packet)
+ {
+ UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
+ this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
+
+ this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_inventoryCache, m_authenticateSessionsClass);
+ }
+
+ public void ServerListener()
+ {
+ m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
+
+ ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
+ Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+ Server.Bind(ServerIncoming);
+
+ m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
+
+ ipeSender = new IPEndPoint(IPAddress.Any, 0);
+ epSender = (EndPoint)ipeSender;
+ ReceivedData = new AsyncCallback(this.OnReceivedData);
+ Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+
+ m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");
+
+ }
+
+ public virtual void RegisterPacketServer(PacketServer server)
+ {
+ this._packetServer = server;
+ }
+
+ public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender)
+ {
+ // find the endpoint for this circuit
+ EndPoint sendto = null;
+ foreach (KeyValuePair p in this.clientCircuits)
+ {
+ if (p.Value == circuitcode)
+ {
+ sendto = p.Key;
+ break;
+ }
+ }
+ if (sendto != null)
+ {
+ //we found the endpoint so send the packet to it
+ this.Server.SendTo(buffer, size, flags, sendto);
+ }
+ }
+
+ public virtual void RemoveClientCircuit(uint circuitcode)
+ {
+ foreach (KeyValuePair p in this.clientCircuits)
+ {
+ if (p.Value == circuitcode)
+ {
+ this.clientCircuits.Remove(p.Key);
+ break;
+ }
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
new file mode 100644
index 0000000..5d1354e
--- /dev/null
+++ b/OpenSim/Region/ClientStack/VersionInfo.cs
@@ -0,0 +1,38 @@
+/*
+* 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;
+
+namespace OpenSim
+{
+ ///
+ ///
+ public class VersionInfo
+ {
+ public static string Version = "0.3, SVN build ";
+ }
+}
--
cgit v1.1
From e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 16:39:11 +0000
Subject: *Some more restructuring/fixing -- should compile, but high chance I
forgot to add/remove something
---
OpenSim/Region/ClientStack/Assets/InventoryCache.cs | 1 +
OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs | 2 +-
OpenSim/Region/ClientStack/ClientView.API.cs | 2 +-
OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs | 4 ++--
OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | 2 +-
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 2 +-
OpenSim/Region/ClientStack/ClientView.cs | 4 ++--
OpenSim/Region/ClientStack/ClientViewBase.cs | 2 +-
OpenSim/Region/ClientStack/PacketServer.cs | 4 ++--
OpenSim/Region/ClientStack/RegionApplicationBase.cs | 5 ++---
OpenSim/Region/ClientStack/UDPServer.cs | 7 +++----
OpenSim/Region/ClientStack/VersionInfo.cs | 2 +-
12 files changed, 18 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c..da74f85 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
+using OpenSim.Region.ClientStack;
namespace OpenSim.Assets
{
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 7552195..f99cf79 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
using libsecondlife;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public interface ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c7..5e346fb 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
using libsecondlife;
using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
partial class ClientView
{
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a..bc6cc21 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using libsecondlife;
using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
partial class ClientView
{
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed02..cbd10dc 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.Assets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public partial class ClientView
{
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef21..51981b8 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.Assets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public partial class ClientView
{
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 312da9d..9c4462d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public delegate bool PacketMethod(ClientView simClient, Packet packet);
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0..7d39405 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Interfaces;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class ClientViewBase
{
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 229570c..ffd254e 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
using System.Net;
using System.Net.Sockets;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class PacketServer
{
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index b421fbd..d39adb5 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -42,14 +42,13 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
using OpenSim.Framework.Servers;
-using OpenSim.Framework.GenericConfig;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class RegionApplicationBase
{
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9..33097ed 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -41,14 +41,13 @@ using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using OpenSim.Framework.Console;
using OpenSim.Framework;
using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
+using OpenSim.Framework.Servers;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class UDPServer : ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
index 5d1354e..249ca94 100644
--- a/OpenSim/Region/ClientStack/VersionInfo.cs
+++ b/OpenSim/Region/ClientStack/VersionInfo.cs
@@ -27,7 +27,7 @@
*/
using System;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
///
///
--
cgit v1.1
From fe120533efd0ec6b2248d96b9a1f8b7637c5dadd Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 17:12:32 +0000
Subject: *Updated prebuild.xml and ran prebuild again *Removed .user, .suo,
and unneccessary files in /bin/Physics/ *OpenSim.sln should compile with nant
and on windows now
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 18 +++++++++---------
.../ClientStack/OpenSim.Region.ClientStack.csproj.user | 12 ------------
2 files changed, 9 insertions(+), 21 deletions(-)
delete mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 0b19359..4b5f2a7 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -126,37 +126,37 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Debug
- AnyCPU
- C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\
- 8.0.50727
- ProjectFiles
- 0
-
-
-
-
--
cgit v1.1
From 9eaecabdd0884cfe17d249440badce1ecdbcc142 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:04:23 +0000
Subject: *Moved VersionInfo.cs to its correct place in OpenSim.csproj *Added
OpenSim.Region.Caps *Updated prebuild.xml and ran prebuild
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 11 +++----
.../Region/ClientStack/RegionApplicationBase.cs | 2 +-
OpenSim/Region/ClientStack/UDPServer.cs | 2 +-
OpenSim/Region/ClientStack/VersionInfo.cs | 38 ----------------------
4 files changed, 6 insertions(+), 47 deletions(-)
delete mode 100644 OpenSim/Region/ClientStack/VersionInfo.cs
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 4b5f2a7..cca7c71 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -135,9 +135,6 @@
Code
-
- Code
-
Code
@@ -147,16 +144,16 @@
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index d39adb5..94db8ee 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,7 +37,7 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework;
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 33097ed..259352c 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -37,7 +37,7 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Assets;
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
deleted file mode 100644
index 249ca94..0000000
--- a/OpenSim/Region/ClientStack/VersionInfo.cs
+++ /dev/null
@@ -1,38 +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;
-
-namespace OpenSim.Region.ClientStack
-{
- ///
- ///
- public class VersionInfo
- {
- public static string Version = "0.3, SVN build ";
- }
-}
--
cgit v1.1
From 0232f01a58a3c0a88e95c22589efec21f502f081 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:43:46 +0000
Subject: *Moved all the classes into their own file from LLSDHelpers.cs *Some
folder renaming to follow project Name *Updated prebuild.xml
---
OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | 4 ----
1 file changed, 4 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index cca7c71..40cd4f0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -70,10 +70,6 @@
..\..\..\bin\libsecondlife.dll
False
-
- OpenSim.FrameworkGenericConfig.Xml.dll
- False
-
System.dll
False
--
cgit v1.1
From 3456d951d89fbc83f742d40ca8ca2a1a79d414eb Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 13:13:17 +0000
Subject: Imported the scripting changes, so now should be up to date with
sugilite.
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 12 ++---
.../OpenSim.Region.ClientStack.dll.build | 60 ++++++++++++++++++++++
2 files changed, 66 insertions(+), 6 deletions(-)
create mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 40cd4f0..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,19 +122,19 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
@@ -143,7 +143,7 @@
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
new file mode 100644
index 0000000..f76a4c8
--- /dev/null
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1
From 108d89f89436556c8f4662197903c374db943f7d Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 16:17:20 +0000
Subject: *Master User is now set up *Added support for getting user profile
information from remote grid server (untested) *Updated prebuild.xml
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 18 +++++++++---------
.../ClientStack/OpenSim.Region.ClientStack.dll.build | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
-
-
-
+
+
+
+
-
-
-
+
+
--
cgit v1.1
From fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 19:09:50 +0000
Subject: *Added UUIDNameRequest packet support (untested, but should work --
at least in sandbox mode) *Various small renamings
---
OpenSim/Region/ClientStack/ClientView.API.cs | 3 ++-
OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | 2 --
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 8 +++++++-
OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | 10 +++++-----
.../Region/ClientStack/OpenSim.Region.ClientStack.dll.build | 6 +++---
5 files changed, 17 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5e346fb..9650b42 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.ClientStack
public event GenericCall6 OnRemoveAvatar;
public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest;
+
+ public event UUIDNameRequest OnNameFromUUIDRequest;
public event ParcelPropertiesRequest OnParcelPropertiesRequest;
public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim.Region.ClientStack
public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
public event EstateOwnerMessageRequest OnEstateOwnerMessage;
-
///
///
///
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index cbd10dc..0456e3c 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -192,7 +192,5 @@ namespace OpenSim.Region.ClientStack
this.OutPacket(mbReply);
*/
}
-
-
}
}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 51981b8..794ce79 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -492,7 +492,13 @@ namespace OpenSim.Region.ClientStack
case PacketType.MoneyBalanceRequest:
this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
break;
-
+ case PacketType.UUIDNameRequest:
+ UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
+ foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
+ {
+ OnNameFromUUIDRequest(UUIDBlock.ID, this);
+ }
+ break;
#region Parcel related packets
case PacketType.ParcelPropertiesRequest:
ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..e679174 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -134,22 +134,22 @@
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..95422c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -15,12 +15,12 @@
+
+
+
-
-
-
--
cgit v1.1
From 135e9b1f538ae77dfd8bf68139c960fb8e016c16 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 28 Jun 2007 19:35:20 +0000
Subject: * Removed J# language support because it has issues with Mono.
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 20 ++++++++++----------
.../ClientStack/OpenSim.Region.ClientStack.dll.build | 12 ++++++------
2 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index e679174..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 95422c8..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
-
-
-
-
+
+
-
-
+
+
+
+
--
cgit v1.1
From 6b3777d3db323f2054aeff1ba4be3e78edef21b8 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 29 Jun 2007 16:43:48 +0000
Subject: *Deleted Logger.cs from OpenSim.Framework
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 18 +++++++++---------
.../ClientStack/OpenSim.Region.ClientStack.dll.build | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
-
-
-
+
+
+
+
-
-
-
+
+
--
cgit v1.1
From 72cd28be1b743a61c739d7d13f933cf41e948fdf Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 29 Jun 2007 20:09:29 +0000
Subject: * Experimental patch: Replaced IPAddress.Any with
IPAddress.Parse("0.0.0.0") to force IPv4
---
OpenSim/Region/ClientStack/UDPServer.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 259352c..b764519 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void OnReceivedData(IAsyncResult result)
{
- ipeSender = new IPEndPoint(IPAddress.Any, 0);
+ ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
epSender = (EndPoint)ipeSender;
Packet packet = null;
int numBytes = Server.EndReceiveFrom(result, ref epSender);
@@ -151,13 +151,13 @@ namespace OpenSim.Region.ClientStack
{
m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
- ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
+ ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
Server.Bind(ServerIncoming);
m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
- ipeSender = new IPEndPoint(IPAddress.Any, 0);
+ ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
epSender = (EndPoint)ipeSender;
ReceivedData = new AsyncCallback(this.OnReceivedData);
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
--
cgit v1.1
From 5e805656db1215518a344d6d5364629a4997fd47 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 1 Jul 2007 13:17:27 +0000
Subject: Fixed SimpleApp - aka thankgoditssundaycommit * Updated SimpleApp
with various introduced dependencies * Extracted ScenePrescence creation in
Scene * removed try-catchall from UserManagerBase (that actually hid a bug) *
Refactored RegionInfo * handle is calculated * it will explode upon
accessing x,y,ip,port,externalip if not explicitly initialized * Removed
superfluous 'ref' keywords * Removed a shitload of 'catch Exception e' that
causes build warnings * Lots of small refactorings, renames et c * Ignored
some bins
---
OpenSim/Region/ClientStack/ClientView.cs | 2 +-
.../ClientStack/OpenSim.Region.ClientStack.csproj | 18 +++++++++---------
.../ClientStack/OpenSim.Region.ClientStack.dll.build | 12 ++++++------
3 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 9c4462d..402a3ca 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void InitNewClient()
{
OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
- this.m_world.AddNewClient(this, this.AgentID, false);
+ this.m_world.AddNewClient(this, false);
}
protected virtual void AuthUser()
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
-
-
-
-
+
+
+
-
-
+
+
+
--
cgit v1.1
From 06a8c132005b4ab804f25d54c0c0f899fc98e3a1 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 1 Jul 2007 16:07:41 +0000
Subject: MAJOR IP RESTRUCTURING
* moving towards IPEndPoints all over the place
* trying to make the internal/external division
---
OpenSim/Region/ClientStack/ClientView.API.cs | 18 +++++++++++-------
OpenSim/Region/ClientStack/PacketServer.cs | 4 +---
OpenSim/Region/ClientStack/UDPServer.cs | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 9650b42..e683db2 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework.Types;
using libsecondlife;
using libsecondlife.Packets;
+using System.Net;
namespace OpenSim.Region.ClientStack
{
@@ -293,8 +294,11 @@ namespace OpenSim.Region.ClientStack
///
///
///
- public void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)
+ public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint )
{
+ System.Net.IPAddress neighbourIP = neighbourEndPoint.Address;
+ ushort neighbourPort = (ushort) neighbourEndPoint.Port;
+
EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
enablesimpacket.SimulatorInfo.Handle = neighbourHandle;
@@ -326,7 +330,7 @@ namespace OpenSim.Region.ClientStack
return agentData;
}
- public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort)
+ public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint)
{
LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);
@@ -339,12 +343,12 @@ namespace OpenSim.Region.ClientStack
newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
newSimPack.RegionData.RegionHandle = newRegionHandle;
- byte[] byteIP = newRegionIP.GetAddressBytes();
+ byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
newSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;
newSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
newSimPack.RegionData.SimIP += (uint)byteIP[0];
- newSimPack.RegionData.SimPort = newRegionPort;
+ newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port;
newSimPack.RegionData.SeedCapability = new byte[0];
this.OutPacket(newSimPack);
@@ -386,7 +390,7 @@ namespace OpenSim.Region.ClientStack
OutPacket(tpLocal);
}
- public void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags)
+ public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags)
{
TeleportFinishPacket teleport = new TeleportFinishPacket();
teleport.Info.AgentID = this.AgentID;
@@ -394,7 +398,7 @@ namespace OpenSim.Region.ClientStack
teleport.Info.SimAccess = simAccess;
teleport.Info.SeedCapability = new byte[0];
- System.Net.IPAddress oIP = System.Net.IPAddress.Parse(ipAddress);
+ IPAddress oIP = newRegionEndPoint.Address;
byte[] byteIP = oIP.GetAddressBytes();
uint ip = (uint)byteIP[3] << 24;
ip += (uint)byteIP[2] << 16;
@@ -402,7 +406,7 @@ namespace OpenSim.Region.ClientStack
ip += (uint)byteIP[0];
teleport.Info.SimIP = ip;
- teleport.Info.SimPort = ipPort;
+ teleport.Info.SimPort = (ushort)newRegionEndPoint.Port;
teleport.Info.LocationID = 4;
teleport.Info.TeleportFlags = 1 << 4;
OutPacket(teleport);
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index ffd254e..6f20413 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -44,12 +44,10 @@ namespace OpenSim.Region.ClientStack
private IWorld _localWorld;
public Dictionary ClientThreads = new Dictionary();
public Dictionary ClientAPIs = new Dictionary();
- protected uint serverPort;
- public PacketServer(ClientStackNetworkHandler networkHandler, uint port)
+ public PacketServer(ClientStackNetworkHandler networkHandler)
{
_networkHandler = networkHandler;
- this.serverPort = port;
_networkHandler.RegisterPacketServer(this);
}
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index b764519..8ad5332 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void CreatePacketServer()
{
- PacketServer packetServer = new PacketServer(this, (uint) listenPort);
+ PacketServer packetServer = new PacketServer(this);
}
protected virtual void OnReceivedData(IAsyncResult result)
--
cgit v1.1
From 9800c05c1b3c7804466d6f3a9c38a739156625fd Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 1 Jul 2007 17:26:33 +0000
Subject: Started change to having SceneObject and then that having child
Primitives which in turn have a Shape object (currently PrimitiveBaseShape).
The plan is only for the SceneObject to interface with the physics engines.
As a physics Entity should be able to have mulitple shapes connected to it.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 76 ++++++++++++++++++++++
.../ClientStack/ClientView.ProcessPackets.cs | 1 -
2 files changed, 76 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index e683db2..5056f41 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -626,6 +626,39 @@ namespace OpenSim.Region.ClientStack
OutPacket(outPacket);
}
+
+ public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID)
+ {
+ ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+ outPacket.RegionData.RegionHandle = regionHandle;
+ outPacket.RegionData.TimeDilation = timeDilation;
+ outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+ outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, textureID, flags);
+ outPacket.ObjectData[0].ID = localID;
+ outPacket.ObjectData[0].FullID = objectID;
+ outPacket.ObjectData[0].OwnerID = ownerID;
+ 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);
+ }
+
+ public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID)
+ {
+ ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+ outPacket.RegionData.RegionHandle = regionHandle;
+ outPacket.RegionData.TimeDilation = timeDilation;
+ outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+ outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, textureID, flags);
+ outPacket.ObjectData[0].ID = localID;
+ outPacket.ObjectData[0].FullID = objectID;
+ outPacket.ObjectData[0].OwnerID = ownerID;
+ byte[] pb = pos.GetBytes();
+ Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+
+ OutPacket(outPacket);
+ }
///
///
///
@@ -816,6 +849,22 @@ namespace OpenSim.Region.ClientStack
}
///
+ /// Create the ObjectDataBlock for a ObjectUpdatePacket (for a Primitive)
+ ///
+ ///
+ ///
+ protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimitiveBaseShape primShape, LLUUID textureID, uint flags)
+ {
+ ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+ this.SetDefaultPrimPacketValues(objupdate);
+ objupdate.UpdateFlags = flags;
+ this.SetPrimPacketShapeData(objupdate, primShape, textureID);
+
+ return objupdate;
+ }
+
+
+ ///
/// Copy the data from a PrimData object to a ObjectUpdatePacket
///
///
@@ -848,6 +897,33 @@ namespace OpenSim.Region.ClientStack
objectData.PathTwistBegin = primData.PathTwistBegin;
}
+ protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimitiveBaseShape primData, LLUUID textureID)
+ {
+ LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
+ objectData.TextureEntry = ntex.ToBytes();
+ 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;
+ }
+
///
/// Set some default values in a ObjectUpdatePacket
///
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 794ce79..0d90968 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -211,7 +211,6 @@ namespace OpenSim.Region.ClientStack
}
break;
case PacketType.ObjectAdd:
- // m_world.AddNewPrim((ObjectAddPacket)Pack, this);
if (OnAddPrim != null)
{
OnAddPrim(Pack, this);
--
cgit v1.1
From 54ef77f0fda5fabc6f4677e145fafb74d225a77e Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 1 Jul 2007 18:33:44 +0000
Subject: Can change the name and description of a prim.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 2 ++
.../ClientStack/ClientView.ProcessPackets.cs | 29 +++++++++++++++++++---
OpenSim/Region/ClientStack/ClientView.cs | 1 +
3 files changed, 29 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5056f41..7a9c6cf 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -58,6 +58,8 @@ namespace OpenSim.Region.ClientStack
public event GenericCall4 OnAddPrim;
public event UpdateShape OnUpdatePrimShape;
public event ObjectSelect OnObjectSelect;
+ public event GenericCall7 OnObjectDescription;
+ public event GenericCall7 OnObjectName;
public event UpdatePrimFlags OnUpdatePrimFlags;
public event UpdatePrimTexture OnUpdatePrimTexture;
public event UpdateVector OnUpdatePrimPosition;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 0d90968..75d3f65 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnModifyTerrain != null)
{
- OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize,
+ OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize,
modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
}
}
@@ -167,8 +167,8 @@ namespace OpenSim.Region.ClientStack
case PacketType.AgentUpdate:
if (OnAgentUpdate != null)
{
- AgentUpdatePacket agenUpdate = (AgentUpdatePacket) Pack;
- OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation );
+ AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;
+ OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation);
}
break;
case PacketType.AgentAnimation:
@@ -274,6 +274,29 @@ namespace OpenSim.Region.ClientStack
OnDeGrapObject(deGrap.ObjectData.LocalID, this);
}
break;
+ case PacketType.ObjectDescription:
+ ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack;
+ for (int i = 0; i < objDes.ObjectData.Length; i++)
+ {
+ if (OnObjectDescription != null)
+ {
+ OnObjectDescription(objDes.ObjectData[i].LocalID, enc.GetString(objDes.ObjectData[i].Description));
+ }
+ }
+ break;
+ case PacketType.ObjectName:
+ ObjectNamePacket objName = (ObjectNamePacket)Pack;
+ for (int i = 0; i < objName.ObjectData.Length; i++)
+ {
+ if (OnObjectName != null)
+ {
+ OnObjectName(objName.ObjectData[i].LocalID, enc.GetString(objName.ObjectData[i].Name));
+ }
+ }
+ break;
+ case PacketType.ObjectPermissions:
+ //Console.WriteLine("permissions set " + Pack.ToString());
+ break;
#endregion
#region Inventory/Asset/Other related packets
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 402a3ca..a36eeb0 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Region.ClientStack
private int cachedtextureserial = 0;
private RegionInfo m_regionData;
protected AuthenticateSessionsBase m_authenticateSessionsHandler;
+ private System.Text.Encoding enc = System.Text.Encoding.ASCII;
public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
{
--
cgit v1.1
From 2852cda727f86567c18c6fab193ed31195c9934c Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 1 Jul 2007 21:04:33 +0000
Subject: More work on SceneObject/Primitive and building (Linking is a work in
progress as is all). Committing now as I've finished for the night and will
be continued tomorrow.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 7a9c6cf..51f02da 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -629,7 +629,7 @@ namespace OpenSim.Region.ClientStack
}
- public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID)
+ public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
{
ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
outPacket.RegionData.RegionHandle = regionHandle;
@@ -639,6 +639,8 @@ namespace OpenSim.Region.ClientStack
outPacket.ObjectData[0].ID = localID;
outPacket.ObjectData[0].FullID = objectID;
outPacket.ObjectData[0].OwnerID = ownerID;
+ outPacket.ObjectData[0].Text = enc.GetBytes(text);
+ outPacket.ObjectData[0].ParentID = parentID;
byte[] pb = pos.GetBytes();
Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
byte[] rot = rotation.GetBytes();
@@ -646,7 +648,7 @@ namespace OpenSim.Region.ClientStack
OutPacket(outPacket);
}
- public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID)
+ public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
{
ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
outPacket.RegionData.RegionHandle = regionHandle;
@@ -656,6 +658,8 @@ namespace OpenSim.Region.ClientStack
outPacket.ObjectData[0].ID = localID;
outPacket.ObjectData[0].FullID = objectID;
outPacket.ObjectData[0].OwnerID = ownerID;
+ outPacket.ObjectData[0].Text = enc.GetBytes(text);
+ outPacket.ObjectData[0].ParentID = parentID;
byte[] pb = pos.GetBytes();
Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
@@ -876,6 +880,7 @@ namespace OpenSim.Region.ClientStack
LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
objectData.TextureEntry = ntex.ToBytes();
objectData.OwnerID = primData.OwnerID;
+ objectData.ParentID = primData.ParentID;
objectData.PCode = primData.PCode;
objectData.PathBegin = primData.PathBegin;
objectData.PathEnd = primData.PathEnd;
@@ -889,7 +894,6 @@ namespace OpenSim.Region.ClientStack
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;
@@ -916,7 +920,6 @@ namespace OpenSim.Region.ClientStack
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;
--
cgit v1.1
From 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 3 Jul 2007 14:37:29 +0000
Subject: * Optimized usings (the 'LL ate my scripts' commit) * added some
licensing info
---
.../Region/ClientStack/Assets/InventoryCache.cs | 17 ++++-----
.../ClientStack/ClientStackNetworkHandler.cs | 6 ---
OpenSim/Region/ClientStack/ClientView.API.cs | 44 +++++++++++-----------
.../ClientStack/ClientView.AgentAssetUpload.cs | 7 ++--
.../ClientStack/ClientView.PacketHandlers.cs | 23 +++--------
.../ClientStack/ClientView.ProcessPackets.cs | 16 ++------
OpenSim/Region/ClientStack/ClientView.cs | 30 +++++++--------
OpenSim/Region/ClientStack/ClientViewBase.cs | 23 +++++------
OpenSim/Region/ClientStack/PacketServer.cs | 8 ++--
.../Region/ClientStack/RegionApplicationBase.cs | 23 +++--------
OpenSim/Region/ClientStack/UDPServer.cs | 19 ++--------
11 files changed, 79 insertions(+), 137 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index da74f85..082c0d0 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -28,13 +28,12 @@
using System;
using System.Collections.Generic;
+using System.Text;
using libsecondlife;
-using OpenSim;
using libsecondlife.Packets;
-//using OpenSim.GridServers;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
using OpenSim.Region.ClientStack;
namespace OpenSim.Assets
@@ -46,7 +45,7 @@ namespace OpenSim.Assets
{
private Dictionary _agentsInventory;
private List _serverRequests; //list of requests made to user server.
- private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ private Encoding _enc = Encoding.ASCII;
private const uint FULL_MASK_PERMISSIONS = 2147483647;
public InventoryCache()
@@ -127,7 +126,7 @@ namespace OpenSim.Assets
return res;
}
- public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
+ public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, AssetBase asset)
{
LLUUID newItem = null;
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@@ -163,7 +162,7 @@ namespace OpenSim.Assets
return res;
}
- public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
+ public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, AssetBase asset)
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
@@ -238,7 +237,7 @@ namespace OpenSim.Assets
Descend.ItemData[i].SalePrice = 100;
Descend.ItemData[i].SaleType = 0;
Descend.ItemData[i].Type = Item.Type;
- Descend.ItemData[i].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ Descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
}
userInfo.OutPacket(Descend);
@@ -286,7 +285,7 @@ namespace OpenSim.Assets
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
InventoryReply.InventoryData[0].Type = Item.Type;
- InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
userInfo.OutPacket(InventoryReply);
}
}
@@ -320,7 +319,7 @@ namespace OpenSim.Assets
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
InventoryReply.InventoryData[0].Type = Item.Type;
- InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
remoteClient.OutPacket(InventoryReply);
}
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index f99cf79..f4e537c 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -25,13 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
using System.Net.Sockets;
-using libsecondlife;
-
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 51f02da..40e0021 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -27,14 +27,14 @@
*/
using System;
using System.Collections.Generic;
+using System.Net;
using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-
+using Axiom.MathLib;
using libsecondlife;
using libsecondlife.Packets;
-using System.Net;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
namespace OpenSim.Region.ClientStack
{
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack
///
public void SendRegionHandshake(RegionInfo regionInfo)
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
RegionHandshakePacket handshake = new RegionHandshakePacket();
handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
@@ -219,8 +219,8 @@ namespace OpenSim.Region.ClientStack
///
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();
+ Encoding enc = Encoding.ASCII;
+ ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
reply.ChatData.Audible = 1;
reply.ChatData.Message = message;
reply.ChatData.ChatType = type;
@@ -260,7 +260,7 @@ namespace OpenSim.Region.ClientStack
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
}
}
@@ -286,7 +286,7 @@ namespace OpenSim.Region.ClientStack
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
}
}
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ClientStack
///
public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint )
{
- System.Net.IPAddress neighbourIP = neighbourEndPoint.Address;
+ IPAddress neighbourIP = neighbourEndPoint.Address;
ushort neighbourPort = (ushort) neighbourEndPoint.Port;
EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
newSimPack.Info = new CrossedRegionPacket.InfoBlock();
newSimPack.Info.Position = pos;
newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
- newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
+ newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
newSimPack.RegionData.RegionHandle = newRegionHandle;
byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack
public void SendMapBlock(List mapBlocks)
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
mapReply.AgentData.AgentID = this.AgentID;
@@ -514,20 +514,20 @@ namespace OpenSim.Region.ClientStack
///
public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
//send a objectupdate packet with information about the clients avatar
ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
objupdate.RegionData.RegionHandle = regionHandle;
objupdate.RegionData.TimeDilation = 64096;
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
+ objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
//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);
+ 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);
@@ -716,9 +716,9 @@ namespace OpenSim.Region.ClientStack
ushort InternVelocityX;
ushort InternVelocityY;
ushort InternVelocityZ;
- Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
+ Vector3 internDirec = new Vector3(0, 0, 0);
- internDirec = new Axiom.MathLib.Vector3(velocity.X, velocity.Y, velocity.Z);
+ internDirec = new Vector3(velocity.X, velocity.Y, velocity.Z);
internDirec = internDirec / 128.0f;
internDirec.x += 1;
@@ -961,7 +961,7 @@ namespace OpenSim.Region.ClientStack
///
protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
{
- libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+ 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);
@@ -977,12 +977,12 @@ namespace OpenSim.Region.ClientStack
{
objdata.TextureEntry = textureEntry;
}
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
+ Encoding enc = Encoding.ASCII;
+ 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);
+ LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
//objdata.FullID=user.AgentID;
byte[] pb = pos.GetBytes();
Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index bc6cc21..60cd33a 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -27,14 +27,13 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
using OpenSim.Assets;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using OpenSim.Region.Caches;
-using libsecondlife;
-using libsecondlife.Packets;
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 0456e3c..e4512d1 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -25,22 +25,9 @@
* 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;
+using OpenSim.Framework.Console;
namespace OpenSim.Region.ClientStack
{
@@ -55,7 +42,7 @@ namespace OpenSim.Region.ClientStack
protected virtual bool Logout(ClientView simClient, Packet packet)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
+ MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
//send reply to let the client logout
LogoutReplyPacket logReply = new LogoutReplyPacket();
logReply.AgentData.AgentID = this.AgentID;
@@ -120,7 +107,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnUpdatePrimPosition != null)
{
- libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
//should update stored position of the prim
@@ -129,7 +116,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnUpdatePrimRotation != null)
{
- libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+ LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
}
@@ -137,7 +124,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnUpdatePrimScale != null)
{
- libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+ LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 75d3f65..8419906 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -26,21 +26,13 @@
*
*/
using System;
-using System.Collections;
using System.Collections.Generic;
+using System.Text;
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.Types;
using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
namespace OpenSim.Region.ClientStack
{
@@ -64,7 +56,7 @@ namespace OpenSim.Region.ClientStack
}
else
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
switch (Pack.Type)
{
@@ -452,7 +444,7 @@ namespace OpenSim.Region.ClientStack
this.OutPacket(tpStart);
TeleportProgressPacket tpProgress = new TeleportProgressPacket();
- tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
+ tpProgress.Info.Message = (new ASCIIEncoding()).GetBytes("sending_landmark");
tpProgress.Info.TeleportFlags = 8;
tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
this.OutPacket(tpProgress);
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index a36eeb0..606ca1d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -25,24 +25,22 @@
* 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.Text;
using System.Threading;
using System.Timers;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Assets;
using OpenSim.Framework;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
using OpenSim.Region.Caches;
+using Timer=System.Timers.Timer;
namespace OpenSim.Region.ClientStack
{
@@ -79,7 +77,7 @@ namespace OpenSim.Region.ClientStack
private int cachedtextureserial = 0;
private RegionInfo m_regionData;
protected AuthenticateSessionsBase m_authenticateSessionsHandler;
- private System.Text.Encoding enc = System.Text.Encoding.ASCII;
+ private Encoding enc = Encoding.ASCII;
public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
{
@@ -91,7 +89,7 @@ namespace OpenSim.Region.ClientStack
m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions;
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
+ MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack;
userEP = remoteEP;
@@ -100,7 +98,7 @@ namespace OpenSim.Region.ClientStack
PacketQueue = new BlockingQueue();
this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
- AckTimer = new System.Timers.Timer(500);
+ AckTimer = new Timer(500);
AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
AckTimer.Start();
@@ -189,7 +187,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void ClientLoop()
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
+ MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
while (true)
{
QueItem nextPacket = PacketQueue.Dequeue();
@@ -211,7 +209,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void InitNewClient()
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
+ MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
this.m_world.AddNewClient(this, false);
}
@@ -222,12 +220,12 @@ namespace OpenSim.Region.ClientStack
if (!sessionInfo.Authorised)
{
//session/circuit not authorised
- OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+ MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
ClientThread.Abort();
}
else
{
- OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
+ MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
//session is authorised
this.AgentID = cirpack.CircuitCode.ID;
this.SessionID = cirpack.CircuitCode.SessionID;
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 7d39405..f105978 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -27,17 +27,14 @@
*
*/
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 libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
namespace OpenSim.Region.ClientStack
{
@@ -47,7 +44,7 @@ namespace OpenSim.Region.ClientStack
protected Dictionary PendingAcks = new Dictionary();
protected Dictionary NeedAck = new Dictionary();
- protected System.Timers.Timer AckTimer;
+ protected Timer AckTimer;
protected uint Sequence = 0;
protected object SequenceLock = new object();
protected const int MAX_APPENDED_ACKS = 10;
@@ -159,7 +156,7 @@ namespace OpenSim.Region.ClientStack
}
catch (Exception)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
+ MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
this.KillThread();
}
@@ -195,8 +192,8 @@ namespace OpenSim.Region.ClientStack
else if ((NewPack.Type == PacketType.StartPingCheck))
{
//reply to pingcheck
- libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
- libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
+ StartPingCheckPacket startPing = (StartPingCheckPacket)NewPack;
+ CompletePingCheckPacket endPing = new CompletePingCheckPacket();
endPing.PingID.PingID = startPing.PingID.PingID;
OutPacket(endPing);
}
@@ -224,7 +221,7 @@ namespace OpenSim.Region.ClientStack
{
if (Pack.Header.Reliable)
{
- libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
+ 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;
@@ -254,7 +251,7 @@ namespace OpenSim.Region.ClientStack
{
if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
+ MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
(now - packet.TickCount) + "ms have passed");
packet.Header.Resent = true;
@@ -273,7 +270,7 @@ namespace OpenSim.Region.ClientStack
if (PendingAcks.Count > 250)
{
// FIXME: Handle the odd case where we have too many pending ACKs queued up
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Too many ACKs queued up!");
+ MainLog.Instance.Verbose( "Too many ACKs queued up!");
return;
}
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 6f20413..b5f0a02 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -25,15 +25,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
-using System.Text;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
using System.Net;
using System.Net.Sockets;
+using libsecondlife.Packets;
using OpenSim.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
using OpenSim.Region.Caches;
namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 94db8ee..1e99c71 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -26,27 +26,16 @@
*
*/
using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
+using System.Net;
using OpenSim.Assets;
-using OpenSim.Region.Caches;
+using OpenSim.Framework;
using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 8ad5332..6eea524 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -26,26 +26,15 @@
*
*/
using System;
-using System.Text;
-using System.IO;
-using System.Threading;
+using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
using OpenSim.Assets;
-using OpenSim.Region.Caches;
-using OpenSim.Framework.Console;
using OpenSim.Framework;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region.Caches;
namespace OpenSim.Region.ClientStack
{
--
cgit v1.1
From bd8018fa1cb32aa42e2a1a41ebb01fc0f1b0a04b Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 3 Jul 2007 20:10:20 +0000
Subject: Today's work on Building support/tools. Think I am slowly getting
there.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 3 +-
.../ClientStack/ClientView.PacketHandlers.cs | 79 +++++++++++++++++++++-
2 files changed, 78 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 40e0021..6de6af6 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.ClientStack
public event UpdatePrimTexture OnUpdatePrimTexture;
public event UpdateVector OnUpdatePrimPosition;
public event UpdatePrimRotation OnUpdatePrimRotation;
+ public event UpdatePrimGroupRotation OnUpdatePrimGroupRotation;
public event UpdateVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus;
public event GenericCall2 OnStopMovement;
@@ -644,7 +645,7 @@ namespace OpenSim.Region.ClientStack
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);
+ Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length);
OutPacket(outPacket);
}
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index e4512d1..0b6c4f6 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -101,8 +101,10 @@ namespace OpenSim.Region.ClientStack
protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
{
MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
+ // Console.WriteLine("new multi update packet " + multipleupdate.ToString());
for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
{
+ #region position
if (multipleupdate.ObjectData[i].Type == 9) //change position
{
if (OnUpdatePrimPosition != null)
@@ -110,24 +112,95 @@ namespace OpenSim.Region.ClientStack
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 == 1) //single item of group change position
+ {
+ if (OnUpdatePrimPosition != null)
+ {
+ // libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ //OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+ }
}
- else if (multipleupdate.ObjectData[i].Type == 10)//rotation
+ #endregion position
+ #region rotation
+ else if (multipleupdate.ObjectData[i].Type == 2)// single item of group rotation from tab
{
if (OnUpdatePrimRotation != null)
{
LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+ // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+ OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+ }
+ }
+ else if (multipleupdate.ObjectData[i].Type == 3)// single item of group rotation from mouse
+ {
+ if (OnUpdatePrimRotation != null)
+ {
+ libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
+ // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+ OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+ }
+ }
+ else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab
+ {
+ if (OnUpdatePrimRotation != null)
+ {
+ libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+ // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
}
- else if (multipleupdate.ObjectData[i].Type == 13)//scale
+ else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse
+ {
+ if (OnUpdatePrimGroupRotation != null)
+ {
+ libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
+ //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+ // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+ OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
+ }
+ }
+ #endregion
+ #region scale
+ else if (multipleupdate.ObjectData[i].Type == 13)//group scale from object tab
{
if (OnUpdatePrimScale != null)
{
LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+ //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+ OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+ }
+ }
+ else if (multipleupdate.ObjectData[i].Type == 29)//group scale from mouse
+ {
+ if (OnUpdatePrimScale != null)
+ {
+ libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z );
+ // OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+ }
+ }
+ else if (multipleupdate.ObjectData[i].Type == 5)//single scale from object tab
+ {
+ if (OnUpdatePrimScale != null)
+ {
+ libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+ // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+ OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+ }
+ }
+ else if (multipleupdate.ObjectData[i].Type == 21)//single scale from mouse
+ {
+ if (OnUpdatePrimScale != null)
+ {
+ libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+ // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
}
+ #endregion
}
return true;
}
--
cgit v1.1
From daf7b8ec76bb333d4808e8cd4392a002042ac2d0 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 4 Jul 2007 05:25:40 +0000
Subject: * Cleaning - attempting to get compiler warnings back down to zero.
---
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 8419906..7f961ef 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -378,7 +378,7 @@ namespace OpenSim.Region.ClientStack
// Console.WriteLine(Pack.ToString());
RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
- bool foundent = false;
+ //bool foundent = false;
/* foreach (Entity ent in m_world.Entities.Values)
{
if (ent.localid == requesttask.InventoryData.LocalID)
--
cgit v1.1
From 249ce4cf6f353dd59ebec27689e74a527c39a090 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 4 Jul 2007 05:49:12 +0000
Subject: * More cleaning - Sugilite now only has build errors for "value is
never used" properties (which I presume will be filled in over time)
---
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 2 +-
OpenSim/Region/ClientStack/ClientView.cs | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 7f961ef..64856ea 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -456,7 +456,7 @@ namespace OpenSim.Region.ClientStack
{
AssetLandmark lm = new AssetLandmark(lma);
- if (lm.RegionID == m_regionData.SimUUID)
+ if (lm.RegionID == m_world.RegionInfo.SimUUID)
{
TeleportLocalPacket tpLocal = new TeleportLocalPacket();
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 606ca1d..52749a1 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack
private AssetCache m_assetCache;
private InventoryCache m_inventoryCache;
private int cachedtextureserial = 0;
- private RegionInfo m_regionData;
protected AuthenticateSessionsBase m_authenticateSessionsHandler;
private Encoding enc = Encoding.ASCII;
--
cgit v1.1
From beb3073bec9438a439e13eaec40a8320a9279adc Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 4 Jul 2007 19:07:27 +0000
Subject: A bit more work on Building tools/support. updated Axiom.MathLib.dll.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 4 +++-
.../Region/ClientStack/ClientView.PacketHandlers.cs | 21 +++++++++++----------
2 files changed, 14 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 6de6af6..9e7117f 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Net;
using System.Text;
-using Axiom.MathLib;
+using Axiom.Math;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Console;
@@ -63,7 +63,9 @@ namespace OpenSim.Region.ClientStack
public event UpdatePrimFlags OnUpdatePrimFlags;
public event UpdatePrimTexture OnUpdatePrimTexture;
public event UpdateVector OnUpdatePrimPosition;
+ public event UpdateVector OnUpdatePrimSinglePosition;
public event UpdatePrimRotation OnUpdatePrimRotation;
+ public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
public event UpdatePrimGroupRotation OnUpdatePrimGroupRotation;
public event UpdateVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus;
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 0b6c4f6..5cea28a 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack
protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
{
MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
- // Console.WriteLine("new multi update packet " + multipleupdate.ToString());
+ //System.Console.WriteLine("new multi update packet " + multipleupdate.ToString());
for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
{
#region position
@@ -116,30 +116,31 @@ namespace OpenSim.Region.ClientStack
}
else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position
{
- if (OnUpdatePrimPosition != null)
+ if (OnUpdatePrimSinglePosition != null)
{
- // libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
- //OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+ libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+ OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
}
#endregion position
#region rotation
else if (multipleupdate.ObjectData[i].Type == 2)// single item of group rotation from tab
{
- if (OnUpdatePrimRotation != null)
+ if (OnUpdatePrimSingleRotation != null)
{
LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
- OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+ OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
}
else if (multipleupdate.ObjectData[i].Type == 3)// single item of group rotation from mouse
{
- if (OnUpdatePrimRotation != null)
+ if (OnUpdatePrimSingleRotation != null)
{
libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
- OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+ OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
}
else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab
@@ -182,7 +183,7 @@ namespace OpenSim.Region.ClientStack
// OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
}
- else if (multipleupdate.ObjectData[i].Type == 5)//single scale from object tab
+ else if (multipleupdate.ObjectData[i].Type == 5)//single prim scale from object tab
{
if (OnUpdatePrimScale != null)
{
@@ -191,7 +192,7 @@ namespace OpenSim.Region.ClientStack
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
}
- else if (multipleupdate.ObjectData[i].Type == 21)//single scale from mouse
+ else if (multipleupdate.ObjectData[i].Type == 21)//single prim scale from mouse
{
if (OnUpdatePrimScale != null)
{
--
cgit v1.1
From 583f2a9de8e503773a427facd5f81a82b40bd585 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 5 Jul 2007 15:15:28 +0000
Subject: *Removed SimProfile.cs as it is no longer needed (in favor of
SimProfileData) *Added simulator_data_request XMLRPC method to request data
from the grid server about a sim instead of faking its login *Login is
progressing, now just getting an XML error (http://pastebin.com/942515) -- if
you can fix this, throw MingChen in IRC a Private Message
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 18 +++++++++---------
.../ClientStack/OpenSim.Region.ClientStack.dll.build | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
-
-
-
+
+
+
+
-
-
-
+
+
--
cgit v1.1
From bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 6 Jul 2007 20:40:03 +0000
Subject: *Fixed several bugs that crashed the viewer and opensim server when
logging in on grid mode *Note: Grid Mode now works in sugilite, but is still
unstable **Known bug in which the grid server crashes after being relaunched
from a previously create configuration **Crashing of the viewer crashes the
OpenSim server which then crashes the grid server -- needs better handling of
exceptions **Multiple sims is still untested, but should connect correctly.
Moving between the sims may be a different story
---
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 3 ++-
OpenSim/Region/ClientStack/ClientViewBase.cs | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 64856ea..0114fb1 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -41,11 +41,12 @@ namespace OpenSim.Region.ClientStack
protected override void ProcessInPacket(Packet Pack)
{
ack_pack(Pack);
+ debug = true;
if (debug)
{
if (Pack.Type != PacketType.AgentUpdate)
{
- Console.WriteLine(Pack.Type.ToString());
+ Console.WriteLine("IN: " + Pack.Type.ToString());
}
}
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index f105978..24c6911 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -71,6 +71,8 @@ namespace OpenSim.Region.ClientStack
// Keep track of when this packet was sent out
Pack.TickCount = Environment.TickCount;
+ Console.WriteLine("OUT: " + Pack.Type.ToString());
+
if (!Pack.Header.Resent)
{
// Set the sequence number
--
cgit v1.1
From 10ece46cf681f389b9ecce5e89b94d749a44e9c1 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 8 Jul 2007 02:58:01 +0000
Subject: * Updating prebuild
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 18 +++++++++---------
.../ClientStack/OpenSim.Region.ClientStack.dll.build | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
-
-
-
-
+
+
+
-
-
+
+
+
--
cgit v1.1
From bdab40280b64e31b763a99f6c2011e7e91e7d0fa Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 8 Jul 2007 03:32:27 +0000
Subject: * Added instant message support for the local region. Grid support
forthcoming.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 25 ++++++++++++++++++++++
.../ClientStack/ClientView.ProcessPackets.cs | 14 ++++++++++++
2 files changed, 39 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 9e7117f..cefe856 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -40,6 +40,7 @@ namespace OpenSim.Region.ClientStack
{
partial class ClientView
{
+ public event ImprovedInstantMessage OnInstantMessage;
public event ChatFromViewer OnChatFromViewer;
public event RezObject OnRezObject;
public event GenericCall4 OnDeRezObject;
@@ -236,6 +237,30 @@ namespace OpenSim.Region.ClientStack
this.OutPacket(reply);
}
+ ///
+ ///
+ ///
+ /// TODO
+ ///
+ ///
+ public void SendInstantMessage(string message, LLUUID target)
+ {
+ ImprovedInstantMessagePacket msg = new ImprovedInstantMessagePacket();
+ msg.AgentData.AgentID = this.AgentID;
+ msg.AgentData.SessionID = this.SessionID;
+
+ msg.MessageBlock.Dialog = 0;
+ msg.MessageBlock.FromGroup = false;
+ msg.MessageBlock.ID = target.Combine(this.AgentID);
+ msg.MessageBlock.Offline = 0;
+ msg.MessageBlock.ParentEstateID = 0;
+ msg.MessageBlock.Position = new LLVector3();
+ msg.MessageBlock.RegionID = new LLUUID();
+ msg.MessageBlock.Timestamp = 0;
+ msg.MessageBlock.ToAgentID = target;
+
+ this.OutPacket(msg);
+ }
///
/// Send the region heightmap to the client
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 0114fb1..def14c7 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -92,6 +92,20 @@ namespace OpenSim.Region.ClientStack
this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
}
break;
+ case PacketType.ImprovedInstantMessage:
+ ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
+
+ string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
+ string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message);
+
+ if (OnInstantMessage != null)
+ {
+ this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.MessageBlock.ToAgentID,
+ msgpack.MessageBlock.Timestamp, IMfromName, IMmessage);
+ }
+
+ break;
+
case PacketType.RezObject:
RezObjectPacket rezPacket = (RezObjectPacket)Pack;
AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
--
cgit v1.1
From 5f8de1e7045b9daa2d4f3b21ca826987e32efe6e Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 8 Jul 2007 19:27:04 +0000
Subject: * By popular demand, all generated build files are now deleted.
Somebody should make sure the wiki is updated.
---
.../ClientStack/OpenSim.Region.ClientStack.csproj | 166 ---------------------
.../OpenSim.Region.ClientStack.dll.build | 60 --------
2 files changed, 226 deletions(-)
delete mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
delete mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
deleted file mode 100644
index 3093eb0..0000000
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {DC3698B2-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenSim.Region.ClientStack
- JScript
- Grid
- IE50
- false
- Library
-
- OpenSim.Region.ClientStack
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- ..\..\..\bin\Axiom.MathLib.dll
- False
-
-
- ..\..\..\bin\Db4objects.Db4o.dll
- False
-
-
- ..\..\..\bin\libsecondlife.dll
- False
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- ..\..\..\bin\XMLRPC.dll
- False
-
-
-
-
- OpenSim.Framework
- {8ACA2445-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Console
- {A7CD0630-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Servers
- {2CC71860-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Region.Caches
- {61FCCDB3-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Region.Physics.Manager
- {F4FF31EB-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Region.Terrain.BasicTerrain
- {C9E0F891-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
deleted file mode 100644
index f76a4c8..0000000
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
cgit v1.1
From 252ff78eb3fafe2c8214446973f3c7f2e80297a2 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 8 Jul 2007 19:28:53 +0000
Subject: Applied animations patch (#175) submitted by dalien
---
OpenSim/Region/ClientStack/ClientView.API.cs | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index cefe856..dfae9e0 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -527,6 +527,21 @@ namespace OpenSim.Region.ClientStack
OutPacket(avp);
}
+ public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId)
+ {
+ AvatarAnimationPacket ani = new AvatarAnimationPacket();
+ ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
+ ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
+ ani.AnimationSourceList[0].ObjectID = sourceAgentId;
+ ani.Sender = new AvatarAnimationPacket.SenderBlock();
+ ani.Sender.ID = sourceAgentId;
+ ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
+ ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
+ ani.AnimationList[0].AnimID = animID;
+ ani.AnimationList[0].AnimSequenceID = seq;
+ this.OutPacket(ani);
+ }
+
#endregion
#region Avatar Packet/data sending Methods
--
cgit v1.1
From f62b7f3d1ed0fbc1afc431a1e25c20ec8effe243 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 8 Jul 2007 19:47:04 +0000
Subject: * reverted rev 1200 waiting for info re animations.xml
---
OpenSim/Region/ClientStack/ClientView.API.cs | 15 ---------------
1 file changed, 15 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index dfae9e0..cefe856 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -527,21 +527,6 @@ namespace OpenSim.Region.ClientStack
OutPacket(avp);
}
- public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId)
- {
- AvatarAnimationPacket ani = new AvatarAnimationPacket();
- ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
- ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
- ani.AnimationSourceList[0].ObjectID = sourceAgentId;
- ani.Sender = new AvatarAnimationPacket.SenderBlock();
- ani.Sender.ID = sourceAgentId;
- ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
- ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
- ani.AnimationList[0].AnimID = animID;
- ani.AnimationList[0].AnimSequenceID = seq;
- this.OutPacket(ani);
- }
-
#endregion
#region Avatar Packet/data sending Methods
--
cgit v1.1
From e8acf1cca92592fea38208dbfe4137555431434d Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 9 Jul 2007 15:29:39 +0000
Subject: * Begun work on Primitive Duplication. Not hooked up yet, but
theoretically could be done so. In practice, more work needs to be done.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 1 +
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 12 ++++++++++++
2 files changed, 13 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index cefe856..3c1df75 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Region.ClientStack
public event LinkObjects OnLinkObjects;
public event UpdateVector OnGrapObject;
public event ObjectSelect OnDeGrapObject;
+ public event ObjectDuplicate OnObjectDuplicate;
public event MoveObject OnGrapUpdate;
public event GenericCall4 OnAddPrim;
public event UpdateShape OnUpdatePrimShape;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index def14c7..982ae50 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -233,6 +233,18 @@ namespace OpenSim.Region.ClientStack
}
}
break;
+ case PacketType.ObjectDuplicate:
+ ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack;
+ for (int i = 0; i < dupe.ObjectData.Length; i++)
+ {
+ if (OnObjectDuplicate != null)
+ {
+ OnObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, dupe.SharedData.DuplicateFlags);
+ }
+ }
+
+ break;
+
case PacketType.ObjectSelect:
ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
for (int i = 0; i < incomingselect.ObjectData.Length; i++)
--
cgit v1.1
From 93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 9 Jul 2007 15:59:35 +0000
Subject: Done a little bit of renaming in primitive.cs and on a few events in
IClientAPI. Disabled CAPS asset uploading as it seems it now crashes the
server.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 6 +++---
OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 3c1df75..5866b45 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -64,11 +64,11 @@ namespace OpenSim.Region.ClientStack
public event GenericCall7 OnObjectName;
public event UpdatePrimFlags OnUpdatePrimFlags;
public event UpdatePrimTexture OnUpdatePrimTexture;
- public event UpdateVector OnUpdatePrimPosition;
+ public event UpdateVector OnUpdatePrimGroupPosition;
public event UpdateVector OnUpdatePrimSinglePosition;
- public event UpdatePrimRotation OnUpdatePrimRotation;
+ public event UpdatePrimRotation OnUpdatePrimGroupRotation;
public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
- public event UpdatePrimGroupRotation OnUpdatePrimGroupRotation;
+ public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
public event UpdateVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus;
public event GenericCall2 OnStopMovement;
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 5cea28a..31ea3eb 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -107,10 +107,10 @@ namespace OpenSim.Region.ClientStack
#region position
if (multipleupdate.ObjectData[i].Type == 9) //change position
{
- if (OnUpdatePrimPosition != null)
+ if (OnUpdatePrimGroupPosition != null)
{
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
- OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+ OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
}
@@ -145,22 +145,22 @@ namespace OpenSim.Region.ClientStack
}
else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab
{
- if (OnUpdatePrimRotation != null)
+ if (OnUpdatePrimGroupRotation != null)
{
libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
- OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+ OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
}
else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse
{
- if (OnUpdatePrimGroupRotation != null)
+ if (OnUpdatePrimGroupMouseRotation != null)
{
libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
//Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
- OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
+ OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
}
}
#endregion
--
cgit v1.1
From d91f33b87b4578eb5e5a9ef22f383ed598cc28e2 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 9 Jul 2007 19:56:22 +0000
Subject: Re-applied dalien patch (#175) and included bin\data with
avataranimations.xml
---
OpenSim/Region/ClientStack/ClientView.API.cs | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5866b45..48d5b9d 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -528,6 +528,21 @@ namespace OpenSim.Region.ClientStack
OutPacket(avp);
}
+ public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId)
+ {
+ AvatarAnimationPacket ani = new AvatarAnimationPacket();
+ ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
+ ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
+ ani.AnimationSourceList[0].ObjectID = sourceAgentId;
+ ani.Sender = new AvatarAnimationPacket.SenderBlock();
+ ani.Sender.ID = sourceAgentId;
+ ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
+ ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
+ ani.AnimationList[0].AnimID = animID;
+ ani.AnimationList[0].AnimSequenceID = seq;
+ this.OutPacket(ani);
+ }
+
#endregion
#region Avatar Packet/data sending Methods
--
cgit v1.1
From 08a1fa3f96eee5e067475da453a3770ff15780f9 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 9 Jul 2007 21:03:36 +0000
Subject: * Introduced ClientManager for great justice.
---
OpenSim/Region/ClientStack/PacketServer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index b5f0a02..5e62450 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.ClientStack
private ClientStackNetworkHandler _networkHandler;
private IWorld _localWorld;
public Dictionary ClientThreads = new Dictionary();
- public Dictionary ClientAPIs = new Dictionary();
+ public ClientManager ClientAPIs = new ClientManager();
public PacketServer(ClientStackNetworkHandler networkHandler)
{
--
cgit v1.1
From 85dd493614cda12488eb7920713ddda07c921dbc Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 9 Jul 2007 21:25:43 +0000
Subject: * some follow up renaming of members et c.
---
OpenSim/Region/ClientStack/PacketServer.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 5e62450..c7ca315 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -41,7 +41,11 @@ namespace OpenSim.Region.ClientStack
private ClientStackNetworkHandler _networkHandler;
private IWorld _localWorld;
public Dictionary ClientThreads = new Dictionary();
- public ClientManager ClientAPIs = new ClientManager();
+ private ClientManager m_clientManager = new ClientManager();
+ public ClientManager ClientManager
+ {
+ get { return m_clientManager; }
+ }
public PacketServer(ClientStackNetworkHandler networkHandler)
{
@@ -150,7 +154,7 @@ namespace OpenSim.Region.ClientStack
authenticateSessionsClass);
this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
- this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
+ this.m_clientManager.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
return true;
}
--
cgit v1.1
From 7f03246653a6f277505d2055528cbb8dd2e1f4c1 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 10 Jul 2007 17:56:31 +0000
Subject: Gird mode in sugilite should now work in so far as you should be able
to login and move between regions in the same instance. Moving to regions in
a different instance of opensim still needs implementing (working on it now).
Also trying to look at the map in grid mode will crash the server.
---
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 1 -
OpenSim/Region/ClientStack/ClientViewBase.cs | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 982ae50..7d924d0 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -41,7 +41,6 @@ namespace OpenSim.Region.ClientStack
protected override void ProcessInPacket(Packet Pack)
{
ack_pack(Pack);
- debug = true;
if (debug)
{
if (Pack.Type != PacketType.AgentUpdate)
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 24c6911..ec7b039 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -71,7 +71,8 @@ namespace OpenSim.Region.ClientStack
// Keep track of when this packet was sent out
Pack.TickCount = Environment.TickCount;
- Console.WriteLine("OUT: " + Pack.Type.ToString());
+
+ // Console.WriteLine("OUT: " + Pack.Type.ToString());
if (!Pack.Header.Resent)
{
--
cgit v1.1
From 561b87b303e8e141ef516b8725ebd3c0be8b1122 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 11 Jul 2007 02:51:51 +0000
Subject: * Applying dalien's patches from bug#177 and #179
---
OpenSim/Region/ClientStack/ClientView.API.cs | 17 +++++++++
.../ClientStack/ClientView.PacketHandlers.cs | 25 ++------------
.../ClientStack/ClientView.ProcessPackets.cs | 2 +-
OpenSim/Region/ClientStack/ClientView.cs | 40 +++++++++++++++++-----
OpenSim/Region/ClientStack/ClientViewBase.cs | 3 +-
OpenSim/Region/ClientStack/PacketServer.cs | 1 +
6 files changed, 53 insertions(+), 35 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 48d5b9d..225e906 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -476,6 +476,23 @@ namespace OpenSim.Region.ClientStack
OutPacket(money);
}
+ public void SendStartPingCheck(byte seq)
+ {
+ StartPingCheckPacket pc = new StartPingCheckPacket();
+ pc.PingID.PingID = seq;
+ OutPacket(pc);
+ }
+
+ public void SendKillObject(ulong regionHandle, uint avatarLocalID)
+ {
+ KillObjectPacket kill = new KillObjectPacket();
+ kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
+ kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
+ kill.ObjectData[0].ID = avatarLocalID;
+ OutPacket(kill);
+ }
+
+
#region Appearance/ Wearables Methods
///
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 31ea3eb..e67807e 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -51,29 +51,8 @@ namespace OpenSim.Region.ClientStack
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();
+ //
+ this.KillClient();
return true;
}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 7d924d0..3265898 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.ClientStack
{
if (Pack.Type != PacketType.AgentUpdate)
{
- Console.WriteLine("IN: " + Pack.Type.ToString());
+ Console.WriteLine(CircuitCode + ":IN: " + Pack.Type.ToString());
}
}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 52749a1..0fe3884 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
+using System;
using System.Collections.Generic;
using System.Net;
using System.Text;
@@ -77,6 +78,11 @@ namespace OpenSim.Region.ClientStack
private int cachedtextureserial = 0;
protected AuthenticateSessionsBase m_authenticateSessionsHandler;
private Encoding enc = Encoding.ASCII;
+ // Dead client detection vars
+ private Timer clientPingTimer;
+ private int packetsReceived = 0;
+ private int probesWithNoIngressPackets = 0;
+ private int lastPacketsReceived = 0;
public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
{
@@ -112,15 +118,7 @@ namespace OpenSim.Region.ClientStack
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);
- }
-
+ clientPingTimer.Stop();
this.m_inventoryCache.ClientLeaving(this.AgentID, null);
m_world.RemoveClient(this.AgentId);
@@ -193,6 +191,9 @@ namespace OpenSim.Region.ClientStack
if (nextPacket.Incoming)
{
//is a incoming packet
+ if (nextPacket.Packet.Type != PacketType.AgentUpdate) {
+ packetsReceived++;
+ }
ProcessInPacket(nextPacket.Packet);
}
else
@@ -204,10 +205,31 @@ namespace OpenSim.Region.ClientStack
}
# endregion
+ protected void CheckClientConnectivity(object sender, ElapsedEventArgs e)
+ {
+ if (packetsReceived == lastPacketsReceived) {
+ probesWithNoIngressPackets++;
+ if (probesWithNoIngressPackets > 30) {
+ this.KillClient();
+ } else {
+ // this will normally trigger at least one packet (ping response)
+ SendStartPingCheck(0);
+ }
+ } else {
+ // Something received in the meantime - we can reset the counters
+ probesWithNoIngressPackets = 0;
+ lastPacketsReceived = packetsReceived;
+ }
+ }
+
# region Setup
protected virtual void InitNewClient()
{
+ clientPingTimer = new Timer(1000);
+ clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
+ clientPingTimer.Enabled = true;
+
MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
this.m_world.AddNewClient(this, false);
}
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index ec7b039..048f4df 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -71,8 +71,7 @@ namespace OpenSim.Region.ClientStack
// Keep track of when this packet was sent out
Pack.TickCount = Environment.TickCount;
-
- // Console.WriteLine("OUT: " + Pack.Type.ToString());
+ Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());
if (!Pack.Header.Resent)
{
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index c7ca315..a88c682 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -178,6 +178,7 @@ namespace OpenSim.Region.ClientStack
public virtual void RemoveClientCircuit(uint circuitcode)
{
this._networkHandler.RemoveClientCircuit(circuitcode);
+ this.m_clientManager.Remove(circuitcode);
}
}
}
--
cgit v1.1