Added SimClientPacketHandlers.cs (moved the SimClient Packet handlers into it)
MW
parent
db6427b6f4
commit
6b15c6e556
|
|
@ -151,6 +151,9 @@
|
||||||
<Compile Include="SimClient.cs">
|
<Compile Include="SimClient.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="SimClientPacketHandlers.cs">
|
||||||
|
<SubType>Code</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Include="VersionInfo.cs">
|
<Compile Include="VersionInfo.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
<include name="RegionInfo.cs" />
|
<include name="RegionInfo.cs" />
|
||||||
<include name="SimClient(Grid).cs" />
|
<include name="SimClient(Grid).cs" />
|
||||||
<include name="SimClient.cs" />
|
<include name="SimClient.cs" />
|
||||||
|
<include name="SimClientPacketHandlers.cs" />
|
||||||
<include name="VersionInfo.cs" />
|
<include name="VersionInfo.cs" />
|
||||||
<include name="Assets/AssetCache.cs" />
|
<include name="Assets/AssetCache.cs" />
|
||||||
<include name="Assets/InventoryCache.cs" />
|
<include name="Assets/InventoryCache.cs" />
|
||||||
|
|
|
||||||
|
|
@ -954,118 +954,6 @@ namespace OpenSim
|
||||||
ClientLoop();
|
ClientLoop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#region Packet handlers
|
|
||||||
|
|
||||||
protected virtual bool Logout(SimClient simClient, Packet packet)
|
|
||||||
{
|
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:ProcessInPacket() - Got a logout request");
|
|
||||||
//send reply to let the client logout
|
|
||||||
LogoutReplyPacket logReply = new LogoutReplyPacket();
|
|
||||||
logReply.AgentData.AgentID = this.AgentID;
|
|
||||||
logReply.AgentData.SessionID = this.SessionID;
|
|
||||||
logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
|
|
||||||
logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
|
|
||||||
logReply.InventoryData[0].ItemID = LLUUID.Zero;
|
|
||||||
OutPacket(logReply);
|
|
||||||
//tell all clients to kill our object
|
|
||||||
KillObjectPacket kill = new KillObjectPacket();
|
|
||||||
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
|
|
||||||
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
|
|
||||||
kill.ObjectData[0].ID = this.ClientAvatar.localid;
|
|
||||||
foreach (SimClient client in m_clientThreads.Values)
|
|
||||||
{
|
|
||||||
client.OutPacket(kill);
|
|
||||||
}
|
|
||||||
if (this.m_userServer != null)
|
|
||||||
{
|
|
||||||
this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this.m_inventoryCache.ClientLeaving(this.AgentID, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
m_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_application.RemoveClientCircuit(this.CircuitCode);
|
|
||||||
this.ClientThread.Abort();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected bool AgentTextureCached(SimClient 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(SimClient simClient, Packet packet)
|
|
||||||
{
|
|
||||||
MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
|
|
||||||
for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
|
|
||||||
{
|
|
||||||
if (multipleupdate.ObjectData[i].Type == 9) //change position
|
|
||||||
{
|
|
||||||
libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
|
|
||||||
foreach (Entity ent in m_world.Entities.Values)
|
|
||||||
{
|
|
||||||
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
|
|
||||||
{
|
|
||||||
((OpenSim.world.Primitive)ent).UpdatePosition(pos);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//should update stored position of the prim
|
|
||||||
}
|
|
||||||
else if (multipleupdate.ObjectData[i].Type == 10)//rotation
|
|
||||||
{
|
|
||||||
libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
|
|
||||||
foreach (Entity ent in m_world.Entities.Values)
|
|
||||||
{
|
|
||||||
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
|
|
||||||
{
|
|
||||||
ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
|
|
||||||
((OpenSim.world.Primitive)ent).UpdateFlag = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (multipleupdate.ObjectData[i].Type == 13)//scale
|
|
||||||
{
|
|
||||||
|
|
||||||
libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
|
|
||||||
foreach (Entity ent in m_world.Entities.Values)
|
|
||||||
{
|
|
||||||
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
|
|
||||||
{
|
|
||||||
((OpenSim.world.Primitive)ent).Scale = scale;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private AgentInventory CreateInventory(LLUUID baseFolder)
|
private AgentInventory CreateInventory(LLUUID baseFolder)
|
||||||
{
|
{
|
||||||
|
|
@ -1127,29 +1015,5 @@ namespace OpenSim
|
||||||
m_assetCache.AddAsset(asset);
|
m_assetCache.AddAsset(asset);
|
||||||
m_inventoryCache.AddNewInventoryItem(this, packet.InventoryBlock.FolderID, asset);
|
m_inventoryCache.AddNewInventoryItem(this, packet.InventoryBlock.FolderID, asset);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RequestMapLayer() //should be getting the map layer from the grid server
|
|
||||||
{
|
|
||||||
//send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
|
|
||||||
MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
|
|
||||||
mapReply.AgentData.AgentID = this.AgentID;
|
|
||||||
mapReply.AgentData.Flags = 0;
|
|
||||||
mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
|
|
||||||
mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
|
|
||||||
mapReply.LayerData[0].Bottom = 800;
|
|
||||||
mapReply.LayerData[0].Left = 800;
|
|
||||||
mapReply.LayerData[0].Top = 1200;
|
|
||||||
mapReply.LayerData[0].Right = 1200;
|
|
||||||
mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
|
|
||||||
this.OutPacket(mapReply);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RequestMapBlock( int minX, int minY, int maxX, int maxY)
|
|
||||||
{
|
|
||||||
//check if our own map was requested
|
|
||||||
this.m_world.RequestMapBlock(this, minX, minY, maxX, maxY);
|
|
||||||
|
|
||||||
//now should get other regions maps from gridserver
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,156 @@
|
||||||
|
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.world;
|
||||||
|
using OpenSim.Assets;
|
||||||
|
|
||||||
|
namespace OpenSim
|
||||||
|
{
|
||||||
|
public partial class SimClient
|
||||||
|
{
|
||||||
|
protected virtual bool Logout(SimClient simClient, Packet packet)
|
||||||
|
{
|
||||||
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
|
||||||
|
//send reply to let the client logout
|
||||||
|
LogoutReplyPacket logReply = new LogoutReplyPacket();
|
||||||
|
logReply.AgentData.AgentID = this.AgentID;
|
||||||
|
logReply.AgentData.SessionID = this.SessionID;
|
||||||
|
logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
|
||||||
|
logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
|
||||||
|
logReply.InventoryData[0].ItemID = LLUUID.Zero;
|
||||||
|
OutPacket(logReply);
|
||||||
|
//tell all clients to kill our object
|
||||||
|
KillObjectPacket kill = new KillObjectPacket();
|
||||||
|
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
|
||||||
|
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
|
||||||
|
kill.ObjectData[0].ID = this.ClientAvatar.localid;
|
||||||
|
foreach (SimClient client in m_clientThreads.Values)
|
||||||
|
{
|
||||||
|
client.OutPacket(kill);
|
||||||
|
}
|
||||||
|
if (this.m_userServer != null)
|
||||||
|
{
|
||||||
|
this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.m_inventoryCache.ClientLeaving(this.AgentID, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_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_application.RemoveClientCircuit(this.CircuitCode);
|
||||||
|
this.ClientThread.Abort();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected bool AgentTextureCached(SimClient 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(SimClient simClient, Packet packet)
|
||||||
|
{
|
||||||
|
MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
|
||||||
|
for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
|
||||||
|
{
|
||||||
|
if (multipleupdate.ObjectData[i].Type == 9) //change position
|
||||||
|
{
|
||||||
|
libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
|
||||||
|
foreach (Entity ent in m_world.Entities.Values)
|
||||||
|
{
|
||||||
|
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
|
||||||
|
{
|
||||||
|
((OpenSim.world.Primitive)ent).UpdatePosition(pos);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//should update stored position of the prim
|
||||||
|
}
|
||||||
|
else if (multipleupdate.ObjectData[i].Type == 10)//rotation
|
||||||
|
{
|
||||||
|
libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
|
||||||
|
foreach (Entity ent in m_world.Entities.Values)
|
||||||
|
{
|
||||||
|
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
|
||||||
|
{
|
||||||
|
ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
|
||||||
|
((OpenSim.world.Primitive)ent).UpdateFlag = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (multipleupdate.ObjectData[i].Type == 13)//scale
|
||||||
|
{
|
||||||
|
|
||||||
|
libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
|
||||||
|
foreach (Entity ent in m_world.Entities.Values)
|
||||||
|
{
|
||||||
|
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
|
||||||
|
{
|
||||||
|
((OpenSim.world.Primitive)ent).Scale = scale;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RequestMapLayer() //should be getting the map layer from the grid server
|
||||||
|
{
|
||||||
|
//send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
|
||||||
|
MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
|
||||||
|
mapReply.AgentData.AgentID = this.AgentID;
|
||||||
|
mapReply.AgentData.Flags = 0;
|
||||||
|
mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
|
||||||
|
mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
|
||||||
|
mapReply.LayerData[0].Bottom = 800;
|
||||||
|
mapReply.LayerData[0].Left = 800;
|
||||||
|
mapReply.LayerData[0].Top = 1200;
|
||||||
|
mapReply.LayerData[0].Right = 1200;
|
||||||
|
mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
|
||||||
|
this.OutPacket(mapReply);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RequestMapBlock(int minX, int minY, int maxX, int maxY)
|
||||||
|
{
|
||||||
|
//check if our own map was requested
|
||||||
|
this.m_world.RequestMapBlock(this, minX, minY, maxX, maxY);
|
||||||
|
|
||||||
|
//now should get other regions maps from gridserver
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue