aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-25 21:31:40 +0000
committerJustin Clarke Casey2008-04-25 21:31:40 +0000
commit6fec9c789b509a8dd2ca636edd61e5f5cd510d11 (patch)
tree22355179323b36cf8c234510ecb0b5ca16a2609d /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
parent* Fixes Mantis: 1049. Y Texture repeat not being applied to resulting animat... (diff)
downloadopensim-SC_OLD-6fec9c789b509a8dd2ca636edd61e5f5cd510d11.zip
opensim-SC_OLD-6fec9c789b509a8dd2ca636edd61e5f5cd510d11.tar.gz
opensim-SC_OLD-6fec9c789b509a8dd2ca636edd61e5f5cd510d11.tar.bz2
opensim-SC_OLD-6fec9c789b509a8dd2ca636edd61e5f5cd510d11.tar.xz
* Check in odds and ends which remain as an attempt to get the item properties panel for a prim's contents working
* Temporarily hacked things to bring our protocol data flow to be pretty much completely identical to the Linden's for this - to absolutely no avail. * Leaving commented code in as a springboard for some future attempt
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs52
1 files changed, 42 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index dd361bf..63cfcbd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -308,6 +308,7 @@ namespace OpenSim.Region.Environment.Scenes
308 } 308 }
309 309
310 m_inventorySerial++; 310 m_inventorySerial++;
311 //m_inventorySerial += 2;
311 HasInventoryChanged = true; 312 HasInventoryChanged = true;
312 } 313 }
313 314
@@ -479,9 +480,10 @@ namespace OpenSim.Region.Environment.Scenes
479 /// </summary> 480 /// </summary>
480 /// <param name="xferManager"></param> 481 /// <param name="xferManager"></param>
481 public void RequestInventoryFile(IXfer xferManager) 482 public void RequestInventoryFile(IXfer xferManager)
482 { 483 {
483 byte[] fileData = new byte[0]; 484 byte[] fileData = new byte[0];
484 InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, UUID); 485 InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, UUID);
486 //InventoryStringBuilder invString = new InventoryStringBuilder(UUID, LLUUID.Zero);
485 487
486 lock (m_taskInventory) 488 lock (m_taskInventory)
487 { 489 {
@@ -489,27 +491,46 @@ namespace OpenSim.Region.Environment.Scenes
489 { 491 {
490 invString.AddItemStart(); 492 invString.AddItemStart();
491 invString.AddNameValueLine("item_id", item.ItemID.ToString()); 493 invString.AddNameValueLine("item_id", item.ItemID.ToString());
494
492 invString.AddNameValueLine("parent_id", item.ParentID.ToString()); 495 invString.AddNameValueLine("parent_id", item.ParentID.ToString());
496// invString.AddNameValueLine("parent_id", UUID.ToString());
493 497
494 invString.AddPermissionsStart(); 498 invString.AddPermissionsStart();
495 invString.AddNameValueLine("base_mask", "0x7FFFFFFF"); 499 invString.AddNameValueLine("base_mask", "7fffffff");
496 invString.AddNameValueLine("owner_mask", "0x7FFFFFFF"); 500 invString.AddNameValueLine("owner_mask", "7fffffff");
497 invString.AddNameValueLine("group_mask", "0x7FFFFFFF"); 501
498 invString.AddNameValueLine("everyone_mask", "0x7FFFFFFF"); 502 invString.AddNameValueLine("group_mask", "7fffffff");
499 invString.AddNameValueLine("next_owner_mask", "0x7FFFFFFF"); 503 invString.AddNameValueLine("everyone_mask", "7fffffff");
504 invString.AddNameValueLine("next_owner_mask", "7fffffff");
505// invString.AddNameValueLine("group_mask", "00000000");
506// invString.AddNameValueLine("everyone_mask", "00000000");
507// invString.AddNameValueLine("next_owner_mask", "00086000");
508
500 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 509 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
501 invString.AddNameValueLine("owner_id", item.OwnerID.ToString()); 510 invString.AddNameValueLine("owner_id", item.OwnerID.ToString());
511
502 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); 512 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
513// invString.AddNameValueLine("last_owner_id", item.OwnerID.ToString());
514
503 invString.AddNameValueLine("group_id", item.GroupID.ToString()); 515 invString.AddNameValueLine("group_id", item.GroupID.ToString());
504 invString.AddSectionEnd(); 516 invString.AddSectionEnd();
505 517
506 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 518 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
507 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 519 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
508 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 520 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
509 invString.AddNameValueLine("flags", "0x00"); 521 invString.AddNameValueLine("flags", "00000000");
522
523 invString.AddSaleStart();
524 invString.AddNameValueLine("sale_type", "not");
525 invString.AddNameValueLine("sale_price", "0");
526 invString.AddSectionEnd();
527
510 invString.AddNameValueLine("name", item.Name + "|"); 528 invString.AddNameValueLine("name", item.Name + "|");
511 invString.AddNameValueLine("desc", item.Description + "|"); 529 invString.AddNameValueLine("desc", item.Description + "|");
530
512 invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); 531 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
532// invString.AddNameValueLine("creation_date", "1209151453");
533
513 invString.AddSectionEnd(); 534 invString.AddSectionEnd();
514 } 535 }
515 } 536 }
@@ -552,19 +573,30 @@ namespace OpenSim.Region.Environment.Scenes
552 AddNameValueLine("obj_id", folderID.ToString()); 573 AddNameValueLine("obj_id", folderID.ToString());
553 AddNameValueLine("parent_id", parentID.ToString()); 574 AddNameValueLine("parent_id", parentID.ToString());
554 AddNameValueLine("type", "category"); 575 AddNameValueLine("type", "category");
555 AddNameValueLine("name", "Contents"); 576 AddNameValueLine("name", "Contents|");
556 AddSectionEnd(); 577 AddSectionEnd();
557 } 578 }
558 579
559 public void AddItemStart() 580 public void AddItemStart()
560 { 581 {
561 BuildString += "\tinv_item\t0\n"; 582 BuildString += "\tinv_item\t0\n";
562 BuildString += "\t{\n"; 583 AddSectionStart();
563 } 584 }
564 585
565 public void AddPermissionsStart() 586 public void AddPermissionsStart()
566 { 587 {
567 BuildString += "\tpermissions 0\n"; 588 BuildString += "\tpermissions 0\n";
589 AddSectionStart();
590 }
591
592 public void AddSaleStart()
593 {
594 BuildString += "\tsale_info\t0\n";
595 AddSectionStart();
596 }
597
598 protected void AddSectionStart()
599 {
568 BuildString += "\t{\n"; 600 BuildString += "\t{\n";
569 } 601 }
570 602