diff options
Should now have version 0.1 of our new ruth default avatar. At the moment, you only see your own avatar correctly, all other user's avatars show up as the old ruth. This will be fixed soon.
We also need better clothing for the new ruth and to edit the body shape.
To get this working you will need to delete your asset yap file and also in grid mode the user server needs to be updated.
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.API.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 9a296f1..2733f0a 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -541,14 +541,14 @@ namespace OpenSim.Region.ClientStack | |||
541 | descend.ItemData[i].FolderID = item.parentFolderID; | 541 | descend.ItemData[i].FolderID = item.parentFolderID; |
542 | descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 542 | descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
543 | descend.ItemData[i].GroupMask = 0; | 543 | descend.ItemData[i].GroupMask = 0; |
544 | descend.ItemData[i].InvType = (sbyte)item.type; | 544 | descend.ItemData[i].InvType = (sbyte)item.invType; |
545 | descend.ItemData[i].Name = enc.GetBytes(item.inventoryName+ "\0"); | 545 | descend.ItemData[i].Name = enc.GetBytes(item.inventoryName+ "\0"); |
546 | descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions; | 546 | descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions; |
547 | descend.ItemData[i].OwnerID = item.avatarID; | 547 | descend.ItemData[i].OwnerID = item.avatarID; |
548 | descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions; | 548 | descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions; |
549 | descend.ItemData[i].SalePrice = 0; | 549 | descend.ItemData[i].SalePrice = 0; |
550 | descend.ItemData[i].SaleType = 0; | 550 | descend.ItemData[i].SaleType = 0; |
551 | descend.ItemData[i].Type = (sbyte)item.type; | 551 | descend.ItemData[i].Type = (sbyte)item.assetType; |
552 | 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); | 552 | 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); |
553 | 553 | ||
554 | i++; | 554 | i++; |
@@ -577,14 +577,14 @@ namespace OpenSim.Region.ClientStack | |||
577 | inventoryReply.InventoryData[0].FolderID = item.parentFolderID; | 577 | inventoryReply.InventoryData[0].FolderID = item.parentFolderID; |
578 | inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 578 | inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
579 | inventoryReply.InventoryData[0].GroupMask = 0; | 579 | inventoryReply.InventoryData[0].GroupMask = 0; |
580 | inventoryReply.InventoryData[0].InvType = (sbyte)item.type; | 580 | inventoryReply.InventoryData[0].InvType = (sbyte)item.invType; |
581 | inventoryReply.InventoryData[0].Name = enc.GetBytes(item.inventoryName + "\0"); | 581 | inventoryReply.InventoryData[0].Name = enc.GetBytes(item.inventoryName + "\0"); |
582 | inventoryReply.InventoryData[0].NextOwnerMask = item.inventoryNextPermissions; | 582 | inventoryReply.InventoryData[0].NextOwnerMask = item.inventoryNextPermissions; |
583 | inventoryReply.InventoryData[0].OwnerID = item.avatarID; | 583 | inventoryReply.InventoryData[0].OwnerID = item.avatarID; |
584 | inventoryReply.InventoryData[0].OwnerMask = item.inventoryCurrentPermissions; | 584 | inventoryReply.InventoryData[0].OwnerMask = item.inventoryCurrentPermissions; |
585 | inventoryReply.InventoryData[0].SalePrice = 0; | 585 | inventoryReply.InventoryData[0].SalePrice = 0; |
586 | inventoryReply.InventoryData[0].SaleType = 0; | 586 | inventoryReply.InventoryData[0].SaleType = 0; |
587 | inventoryReply.InventoryData[0].Type = (sbyte)item.type; | 587 | inventoryReply.InventoryData[0].Type = (sbyte)item.assetType; |
588 | 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); | 588 | 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); |
589 | 589 | ||
590 | this.OutPacket(inventoryReply); | 590 | this.OutPacket(inventoryReply); |
@@ -610,14 +610,14 @@ namespace OpenSim.Region.ClientStack | |||
610 | InventoryReply.InventoryData[0].FolderID = Item.parentFolderID; | 610 | InventoryReply.InventoryData[0].FolderID = Item.parentFolderID; |
611 | InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 611 | InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
612 | InventoryReply.InventoryData[0].GroupMask = 0; | 612 | InventoryReply.InventoryData[0].GroupMask = 0; |
613 | InventoryReply.InventoryData[0].InvType =(sbyte) Item.type; | 613 | InventoryReply.InventoryData[0].InvType =(sbyte) Item.invType; |
614 | InventoryReply.InventoryData[0].Name = enc.GetBytes(Item.inventoryName + "\0"); | 614 | InventoryReply.InventoryData[0].Name = enc.GetBytes(Item.inventoryName + "\0"); |
615 | InventoryReply.InventoryData[0].NextOwnerMask = Item.inventoryNextPermissions; | 615 | InventoryReply.InventoryData[0].NextOwnerMask = Item.inventoryNextPermissions; |
616 | InventoryReply.InventoryData[0].OwnerID = Item.avatarID; | 616 | InventoryReply.InventoryData[0].OwnerID = Item.avatarID; |
617 | InventoryReply.InventoryData[0].OwnerMask = Item.inventoryCurrentPermissions; | 617 | InventoryReply.InventoryData[0].OwnerMask = Item.inventoryCurrentPermissions; |
618 | InventoryReply.InventoryData[0].SalePrice = 100; | 618 | InventoryReply.InventoryData[0].SalePrice = 100; |
619 | InventoryReply.InventoryData[0].SaleType = 0; | 619 | InventoryReply.InventoryData[0].SaleType = 0; |
620 | InventoryReply.InventoryData[0].Type =(sbyte) Item.type; | 620 | InventoryReply.InventoryData[0].Type =(sbyte) Item.assetType; |
621 | 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); | 621 | 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); |
622 | 622 | ||
623 | OutPacket(InventoryReply); | 623 | OutPacket(InventoryReply); |