aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
authorMW2007-07-19 20:21:02 +0000
committerMW2007-07-19 20:21:02 +0000
commitb2c6f316e16e9bb33f81997319a4130fa683bc48 (patch)
tree632f901a43267c2f3a7c0de8feff2e4ddc845275 /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
parent*Handler Functions can now refuse an object as invalid by returning false, th... (diff)
downloadopensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.zip
opensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.gz
opensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.bz2
opensim-SC_OLD-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.xz
Some work on Inventory (not yet finished or enabled)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs40
1 files changed, 18 insertions, 22 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index c248b29..267e7ee 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -373,7 +373,8 @@ namespace OpenSim.Region.ClientStack
373 break; 373 break;
374 case PacketType.AssetUploadRequest: 374 case PacketType.AssetUploadRequest:
375 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 375 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
376 this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); 376 // Console.WriteLine(request.ToString());
377 //this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
377 break; 378 break;
378 case PacketType.RequestXfer: 379 case PacketType.RequestXfer:
379 //Console.WriteLine(Pack.ToString()); 380 //Console.WriteLine(Pack.ToString());
@@ -382,9 +383,12 @@ namespace OpenSim.Region.ClientStack
382 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack); 383 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
383 break; 384 break;
384 case PacketType.CreateInventoryFolder: 385 case PacketType.CreateInventoryFolder:
385 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; 386 if (this.OnCreateNewInventoryFolder != null)
386 m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); 387 {
387 //Console.WriteLine(Pack.ToString()); 388 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
389 this.OnCreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
390 //m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
391 }
388 break; 392 break;
389 case PacketType.CreateInventoryItem: 393 case PacketType.CreateInventoryItem:
390 //Console.WriteLine(Pack.ToString()); 394 //Console.WriteLine(Pack.ToString());
@@ -405,8 +409,12 @@ namespace OpenSim.Region.ClientStack
405 m_inventoryCache.FetchInventory(this, FetchInventory); 409 m_inventoryCache.FetchInventory(this, FetchInventory);
406 break; 410 break;
407 case PacketType.FetchInventoryDescendents: 411 case PacketType.FetchInventoryDescendents:
408 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; 412 if (this.OnFetchInventoryDescendents != null)
409 m_inventoryCache.FetchInventoryDescendents(this, Fetch); 413 {
414 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
415 // m_inventoryCache.FetchInventoryDescendents(this, Fetch);
416 this.OnFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID, Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems, Fetch.InventoryData.SortOrder);
417 }
410 break; 418 break;
411 case PacketType.UpdateInventoryItem: 419 case PacketType.UpdateInventoryItem:
412 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; 420 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
@@ -444,22 +452,10 @@ namespace OpenSim.Region.ClientStack
444 case PacketType.RequestTaskInventory: 452 case PacketType.RequestTaskInventory:
445 // Console.WriteLine(Pack.ToString()); 453 // Console.WriteLine(Pack.ToString());
446 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; 454 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
447 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); 455 if (this.OnRequestTaskInventory != null)
448 //bool foundent = false; 456 {
449 /* foreach (Entity ent in m_world.Entities.Values) 457 this.OnRequestTaskInventory(this, requesttask.InventoryData.LocalID);
450 { 458 }
451 if (ent.localid == requesttask.InventoryData.LocalID)
452 {
453 replytask.InventoryData.TaskID = ent.uuid;
454 replytask.InventoryData.Serial = 0;
455 replytask.InventoryData.Filename = new byte[0];
456 foundent = true;
457 }
458 }
459 if (foundent)
460 {
461 this.OutPacket(replytask);
462 }*/
463 break; 459 break;
464 case PacketType.UpdateTaskInventory: 460 case PacketType.UpdateTaskInventory:
465 // Console.WriteLine(Pack.ToString()); 461 // Console.WriteLine(Pack.ToString());