From 1b850b4483956a8ef7cb5b44911b1e8dab9f7e86 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 27 Jul 2007 16:23:04 +0000
Subject: 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.
---
OpenSim/Region/ClientStack/ClientView.API.cs | 12 ++---
.../Environment/Scenes/Scene.PacketHandlers.cs | 2 +-
.../GridInterfaces/Local/LocalAssetServer.cs | 60 ++++++++++++++++++++++
3 files changed, 67 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region')
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
descend.ItemData[i].FolderID = item.parentFolderID;
descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
descend.ItemData[i].GroupMask = 0;
- descend.ItemData[i].InvType = (sbyte)item.type;
+ descend.ItemData[i].InvType = (sbyte)item.invType;
descend.ItemData[i].Name = enc.GetBytes(item.inventoryName+ "\0");
descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions;
descend.ItemData[i].OwnerID = item.avatarID;
descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions;
descend.ItemData[i].SalePrice = 0;
descend.ItemData[i].SaleType = 0;
- descend.ItemData[i].Type = (sbyte)item.type;
+ descend.ItemData[i].Type = (sbyte)item.assetType;
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);
i++;
@@ -577,14 +577,14 @@ namespace OpenSim.Region.ClientStack
inventoryReply.InventoryData[0].FolderID = item.parentFolderID;
inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
inventoryReply.InventoryData[0].GroupMask = 0;
- inventoryReply.InventoryData[0].InvType = (sbyte)item.type;
+ inventoryReply.InventoryData[0].InvType = (sbyte)item.invType;
inventoryReply.InventoryData[0].Name = enc.GetBytes(item.inventoryName + "\0");
inventoryReply.InventoryData[0].NextOwnerMask = item.inventoryNextPermissions;
inventoryReply.InventoryData[0].OwnerID = item.avatarID;
inventoryReply.InventoryData[0].OwnerMask = item.inventoryCurrentPermissions;
inventoryReply.InventoryData[0].SalePrice = 0;
inventoryReply.InventoryData[0].SaleType = 0;
- inventoryReply.InventoryData[0].Type = (sbyte)item.type;
+ inventoryReply.InventoryData[0].Type = (sbyte)item.assetType;
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);
this.OutPacket(inventoryReply);
@@ -610,14 +610,14 @@ namespace OpenSim.Region.ClientStack
InventoryReply.InventoryData[0].FolderID = Item.parentFolderID;
InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
InventoryReply.InventoryData[0].GroupMask = 0;
- InventoryReply.InventoryData[0].InvType =(sbyte) Item.type;
+ InventoryReply.InventoryData[0].InvType =(sbyte) Item.invType;
InventoryReply.InventoryData[0].Name = enc.GetBytes(Item.inventoryName + "\0");
InventoryReply.InventoryData[0].NextOwnerMask = Item.inventoryNextPermissions;
InventoryReply.InventoryData[0].OwnerID = Item.avatarID;
InventoryReply.InventoryData[0].OwnerMask = Item.inventoryCurrentPermissions;
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
- InventoryReply.InventoryData[0].Type =(sbyte) Item.type;
+ InventoryReply.InventoryData[0].Type =(sbyte) Item.assetType;
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);
OutPacket(InventoryReply);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 11c2030..70bd003 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -688,7 +688,7 @@ namespace OpenSim.Region.Environment.Scenes
item.assetID = asset.FullID;
item.inventoryDescription = description;
item.inventoryName = name;
- item.type = invType;
+ item.assetType = invType;
item.parentFolderID = folderID;
item.inventoryCurrentPermissions = 2147483647;
item.inventoryNextPermissions = nextOwnerMask;
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 919ad6c..38bf9bf 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -246,6 +246,40 @@ namespace OpenSim.Region.GridInterfaces.Local
db.Set(store);
db.Commit();
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");
+ Image.Name = "Female Body Texture";
+ this.LoadAsset(Image, true, "femalebody.jp2");
+ store = new AssetStorage();
+ store.Data = Image.Data;
+ store.Name = Image.Name;
+ store.UUID = Image.FullID;
+ db.Set(store);
+ db.Commit();
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");
+ Image.Name = "Female Bottom Texture";
+ this.LoadAsset(Image, true, "femalebottom.jp2");
+ store = new AssetStorage();
+ store.Data = Image.Data;
+ store.Name = Image.Name;
+ store.UUID = Image.FullID;
+ db.Set(store);
+ db.Commit();
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");
+ Image.Name = "Female Face Texture";
+ this.LoadAsset(Image, true, "femaleface.jp2");
+ store = new AssetStorage();
+ store.Data = Image.Data;
+ store.Name = Image.Name;
+ store.UUID = Image.FullID;
+ db.Set(store);
+ db.Commit();
+
+
/*
Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000008");
@@ -286,6 +320,32 @@ namespace OpenSim.Region.GridInterfaces.Local
db.Commit();
Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");
+ Image.Name = "Shirt";
+ Image.Type = 5;
+ Image.InvType = 18;
+ this.LoadAsset(Image, false, "newshirt.dat");
+ store = new AssetStorage();
+ store.Data = Image.Data;
+ store.Name = Image.Name;
+ store.UUID = Image.FullID;
+ db.Set(store);
+ db.Commit();
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");
+ Image.Name = "Shirt";
+ Image.Type = 5;
+ Image.InvType = 18;
+ this.LoadAsset(Image, false, "newpants.dat");
+ store = new AssetStorage();
+ store.Data = Image.Data;
+ store.Name = Image.Name;
+ store.UUID = Image.FullID;
+ db.Set(store);
+ db.Commit();
+
+ Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-2222-3333-000000000001");
Image.Name = "WelcomeNote";
Image.Type = 7;
--
cgit v1.1