aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs15
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs49
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs4
-rw-r--r--OpenSim/Framework/Data/InventoryData.cs6
-rw-r--r--OpenSim/Framework/General/Types/AgentWearable.cs10
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs60
-rw-r--r--bin/assets/base_skin.dat6
-rw-r--r--bin/assets/femalebody.jp2bin0 -> 56124 bytes
-rw-r--r--bin/assets/femalebottom.jp2bin0 -> 54574 bytes
-rw-r--r--bin/assets/femaleface.jp2bin0 -> 76425 bytes
-rw-r--r--bin/assets/newhair.dat63
-rw-r--r--bin/assets/newpants.dat33
-rw-r--r--bin/assets/newshirt.dat34
16 files changed, 263 insertions, 33 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 32ba830..0c6d971 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -350,7 +350,6 @@ namespace OpenSim.Framework.Communications.Caches
350 Transfer.TransferInfo.TargetType = 0; 350 Transfer.TransferInfo.TargetType = 0;
351 if (req.AssetRequestSource == 2) 351 if (req.AssetRequestSource == 2)
352 { 352 {
353 //Transfer.TransferInfo.Params = req.Params;
354 Transfer.TransferInfo.Params = new byte[20]; 353 Transfer.TransferInfo.Params = new byte[20];
355 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); 354 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
356 int assType = (int)req.AssetInf.Type; 355 int assType = (int)req.AssetInf.Type;
@@ -389,19 +388,19 @@ namespace OpenSim.Framework.Communications.Caches
389 { 388 {
390 chunk = new byte[req.AssetInf.Data.Length]; 389 chunk = new byte[req.AssetInf.Data.Length];
391 Array.Copy(req.AssetInf.Data, chunk, req.AssetInf.Data.Length); 390 Array.Copy(req.AssetInf.Data, chunk, req.AssetInf.Data.Length);
391 TransferPacket.TransferData.Data = chunk;
392 TransferPacket.TransferData.Status = 1;
393 req.RequestUser.OutPacket(TransferPacket);
392 } 394 }
393 else 395 else
394 { 396 {
395 chunk = new byte[1000]; 397 chunk = new byte[1000];
396 Array.Copy(req.AssetInf.Data, chunk, 1000); 398 Array.Copy(req.AssetInf.Data, chunk, 1000);
397 }
398 399
399 TransferPacket.TransferData.Data = chunk; 400 TransferPacket.TransferData.Data = chunk;
400 TransferPacket.TransferData.Status = 0; 401 TransferPacket.TransferData.Status = 0;
401 req.RequestUser.OutPacket(TransferPacket); 402 req.RequestUser.OutPacket(TransferPacket);
402 403
403 if (req.AssetInf.Data.Length > 1000)
404 {
405 TransferPacket = new TransferPacketPacket(); 404 TransferPacket = new TransferPacketPacket();
406 TransferPacket.TransferData.Packet = 1; 405 TransferPacket.TransferData.Packet = 1;
407 TransferPacket.TransferData.ChannelType = 2; 406 TransferPacket.TransferData.ChannelType = 2;
@@ -411,7 +410,7 @@ namespace OpenSim.Framework.Communications.Caches
411 TransferPacket.TransferData.Data = chunk1; 410 TransferPacket.TransferData.Data = chunk1;
412 TransferPacket.TransferData.Status = 1; 411 TransferPacket.TransferData.Status = 1;
413 req.RequestUser.OutPacket(TransferPacket); 412 req.RequestUser.OutPacket(TransferPacket);
414 } 413 }
415 } 414 }
416 415
417 } 416 }
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index f807b2b..7813adc 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Communications.Caches
43 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002"); 43 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002");
44 item.inventoryDescription = "Plywood texture"; 44 item.inventoryDescription = "Plywood texture";
45 item.inventoryName = "Plywood"; 45 item.inventoryName = "Plywood";
46 item.type = 0; 46 item.assetType = 0;
47 item.parentFolderID = m_textureFolder.folderID; 47 item.parentFolderID = m_textureFolder.folderID;
48 item.inventoryBasePermissions = 0x7FFFFFFF; 48 item.inventoryBasePermissions = 0x7FFFFFFF;
49 item.inventoryEveryOnePermissions = 0x7FFFFFFF; 49 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Communications.Caches
58 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000003"); 58 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000003");
59 item.inventoryDescription = "Rocks texture"; 59 item.inventoryDescription = "Rocks texture";
60 item.inventoryName = "Rocks"; 60 item.inventoryName = "Rocks";
61 item.type = 0; 61 item.assetType = 0;
62 item.parentFolderID = m_textureFolder.folderID; 62 item.parentFolderID = m_textureFolder.folderID;
63 item.inventoryBasePermissions = 0x7FFFFFFF; 63 item.inventoryBasePermissions = 0x7FFFFFFF;
64 item.inventoryEveryOnePermissions = 0x7FFFFFFF; 64 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Caches
73 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000001"); 73 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000001");
74 item.inventoryDescription = "Bricks texture"; 74 item.inventoryDescription = "Bricks texture";
75 item.inventoryName = "Bricks"; 75 item.inventoryName = "Bricks";
76 item.type = 0; 76 item.assetType = 0;
77 item.parentFolderID = m_textureFolder.folderID; 77 item.parentFolderID = m_textureFolder.folderID;
78 item.inventoryBasePermissions = 0x7FFFFFFF; 78 item.inventoryBasePermissions = 0x7FFFFFFF;
79 item.inventoryEveryOnePermissions = 0x7FFFFFFF; 79 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Communications.Caches
88 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000004"); 88 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000004");
89 item.inventoryDescription = "Granite texture"; 89 item.inventoryDescription = "Granite texture";
90 item.inventoryName = "Granite"; 90 item.inventoryName = "Granite";
91 item.type = 0; 91 item.assetType = 0;
92 item.parentFolderID = m_textureFolder.folderID; 92 item.parentFolderID = m_textureFolder.folderID;
93 item.inventoryBasePermissions = 0x7FFFFFFF; 93 item.inventoryBasePermissions = 0x7FFFFFFF;
94 item.inventoryEveryOnePermissions = 0x7FFFFFFF; 94 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications.Caches
103 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000005"); 103 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000005");
104 item.inventoryDescription = "Hardwood texture"; 104 item.inventoryDescription = "Hardwood texture";
105 item.inventoryName = "Hardwood"; 105 item.inventoryName = "Hardwood";
106 item.type = 0; 106 item.assetType = 0;
107 item.parentFolderID = m_textureFolder.folderID; 107 item.parentFolderID = m_textureFolder.folderID;
108 item.inventoryBasePermissions = 0x7FFFFFFF; 108 item.inventoryBasePermissions = 0x7FFFFFFF;
109 item.inventoryEveryOnePermissions = 0x7FFFFFFF; 109 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -118,7 +118,8 @@ namespace OpenSim.Framework.Communications.Caches
118 item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 118 item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
119 item.inventoryDescription = "Default Shape"; 119 item.inventoryDescription = "Default Shape";
120 item.inventoryName = "Default Shape"; 120 item.inventoryName = "Default Shape";
121 item.type = 13; 121 item.assetType = 13;
122 item.invType = 18;
122 item.parentFolderID = this.folderID; 123 item.parentFolderID = this.folderID;
123 item.inventoryCurrentPermissions = 0; 124 item.inventoryCurrentPermissions = 0;
124 item.inventoryNextPermissions = 0; 125 item.inventoryNextPermissions = 0;
@@ -131,12 +132,41 @@ namespace OpenSim.Framework.Communications.Caches
131 item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); 132 item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
132 item.inventoryDescription = "Default Skin"; 133 item.inventoryDescription = "Default Skin";
133 item.inventoryName = "Default Skin"; 134 item.inventoryName = "Default Skin";
134 item.type = 13; 135 item.assetType = 13;
136 item.invType = 18;
135 item.parentFolderID = this.folderID; 137 item.parentFolderID = this.folderID;
136 item.inventoryCurrentPermissions = 0; 138 item.inventoryCurrentPermissions = 0;
137 item.inventoryNextPermissions = 0; 139 item.inventoryNextPermissions = 0;
138 this.Items.Add(item.inventoryID, item); 140 this.Items.Add(item.inventoryID, item);
139 141
142 item = new InventoryItemBase();
143 item.avatarID = libOwner;
144 item.creatorsID = libOwner;
145 item.inventoryID = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000");
146 item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111110");
147 item.inventoryDescription = "Default Shirt";
148 item.inventoryName = "Default Shirt";
149 item.assetType = 5;
150 item.invType = 18;
151 item.parentFolderID = this.folderID;
152 item.inventoryCurrentPermissions = 0;
153 item.inventoryNextPermissions = 0;
154 this.Items.Add(item.inventoryID, item);
155
156 item = new InventoryItemBase();
157 item.avatarID = libOwner;
158 item.creatorsID = libOwner;
159 item.inventoryID = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
160 item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111120");
161 item.inventoryDescription = "Default Pants";
162 item.inventoryName = "Default Pants";
163 item.assetType = 5;
164 item.invType = 18;
165 item.parentFolderID = this.folderID;
166 item.inventoryCurrentPermissions = 0;
167 item.inventoryNextPermissions = 0;
168 this.Items.Add(item.inventoryID, item);
169
140 item = new InventoryItemBase(); 170 item = new InventoryItemBase();
141 item.avatarID = libOwner; 171 item.avatarID = libOwner;
142 item.creatorsID = libOwner; 172 item.creatorsID = libOwner;
@@ -144,7 +174,8 @@ namespace OpenSim.Framework.Communications.Caches
144 item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001"); 174 item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001");
145 item.inventoryDescription = "Welcome"; 175 item.inventoryDescription = "Welcome";
146 item.inventoryName = "Welcome"; 176 item.inventoryName = "Welcome";
147 item.type = 7; 177 item.assetType = 7;
178 item.invType = 7;
148 item.parentFolderID = this.folderID; 179 item.parentFolderID = this.folderID;
149 item.inventoryCurrentPermissions = (1 << 15); 180 item.inventoryCurrentPermissions = (1 << 15);
150 item.inventoryNextPermissions = (1 << 15); 181 item.inventoryNextPermissions = (1 << 15);
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 5df66f4..a55297a 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -299,7 +299,7 @@ namespace OpenSim.Region.Capabilities
299 private LLUUID newAssetID; 299 private LLUUID newAssetID;
300 private LLUUID inventoryItemID; 300 private LLUUID inventoryItemID;
301 private BaseHttpServer httpListener; 301 private BaseHttpServer httpListener;
302 private bool SaveImages = true; 302 private bool SaveImages = false;
303 private string m_assetName = ""; 303 private string m_assetName = "";
304 304
305 /// <summary> 305 /// <summary>
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index affb8f3..3624c7d 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Data.MySQL
405 item.inventoryName = (string)reader["inventoryName"]; 405 item.inventoryName = (string)reader["inventoryName"];
406 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString()); 406 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
407 item.parentFolderID = new LLUUID((string)reader["parentFolderID"]); 407 item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
408 item.type = Convert.ToInt32(reader["type"].ToString()); 408 item.assetType = Convert.ToInt32(reader["type"].ToString());
409 409
410 rows.Add(item); 410 rows.Add(item);
411 } 411 }
@@ -474,7 +474,7 @@ namespace OpenSim.Framework.Data.MySQL
474 Dictionary<string, string> parameters = new Dictionary<string, string>(); 474 Dictionary<string, string> parameters = new Dictionary<string, string>();
475 parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated(); 475 parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();
476 parameters["?assetID"] = item.assetID.ToStringHyphenated(); 476 parameters["?assetID"] = item.assetID.ToStringHyphenated();
477 parameters["?type"] = item.type.ToString(); 477 parameters["?type"] = item.assetType.ToString();
478 parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated(); 478 parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();
479 parameters["?avatarID"] = item.avatarID.ToStringHyphenated(); 479 parameters["?avatarID"] = item.avatarID.ToStringHyphenated();
480 parameters["?inventoryName"] = item.inventoryName; 480 parameters["?inventoryName"] = item.inventoryName;
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index c43ff1a..a12b87b 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -46,7 +46,11 @@ namespace OpenSim.Framework.Data
46 /// <summary> 46 /// <summary>
47 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc) 47 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
48 /// </summary> 48 /// </summary>
49 public int type; 49 public int assetType;
50 /// <summary>
51 /// The type of inventory item. (Can be slightly different to the asset type
52 /// </summary>
53 public int invType;
50 /// <summary> 54 /// <summary>
51 /// The folder this item is contained in 55 /// The folder this item is contained in
52 /// </summary> 56 /// </summary>
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 8c704ce..1b287a9 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
@@ -51,8 +51,14 @@ namespace OpenSim.Framework.Types
51 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 51 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
52 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"); 52 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
53 53
54 //defaultWearables[1].ItemID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"); 54 defaultWearables[1].ItemID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9");
55 //defaultWearables[1].AssetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); 55 defaultWearables[1].AssetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
56
57 defaultWearables[4].ItemID = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000");
58 defaultWearables[4].AssetID = new LLUUID("00000000-38f9-1111-024e-222222111110");
59
60 defaultWearables[5].ItemID = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
61 defaultWearables[5].AssetID = new LLUUID("00000000-38f9-1111-024e-222222111120");
56 return defaultWearables; 62 return defaultWearables;
57 } 63 }
58 } 64 }
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);
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
688 item.assetID = asset.FullID; 688 item.assetID = asset.FullID;
689 item.inventoryDescription = description; 689 item.inventoryDescription = description;
690 item.inventoryName = name; 690 item.inventoryName = name;
691 item.type = invType; 691 item.assetType = invType;
692 item.parentFolderID = folderID; 692 item.parentFolderID = folderID;
693 item.inventoryCurrentPermissions = 2147483647; 693 item.inventoryCurrentPermissions = 2147483647;
694 item.inventoryNextPermissions = nextOwnerMask; 694 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
246 db.Set(store); 246 db.Set(store);
247 db.Commit(); 247 db.Commit();
248 248
249 Image = new AssetBase();
250 Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");
251 Image.Name = "Female Body Texture";
252 this.LoadAsset(Image, true, "femalebody.jp2");
253 store = new AssetStorage();
254 store.Data = Image.Data;
255 store.Name = Image.Name;
256 store.UUID = Image.FullID;
257 db.Set(store);
258 db.Commit();
259
260 Image = new AssetBase();
261 Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");
262 Image.Name = "Female Bottom Texture";
263 this.LoadAsset(Image, true, "femalebottom.jp2");
264 store = new AssetStorage();
265 store.Data = Image.Data;
266 store.Name = Image.Name;
267 store.UUID = Image.FullID;
268 db.Set(store);
269 db.Commit();
270
271 Image = new AssetBase();
272 Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");
273 Image.Name = "Female Face Texture";
274 this.LoadAsset(Image, true, "femaleface.jp2");
275 store = new AssetStorage();
276 store.Data = Image.Data;
277 store.Name = Image.Name;
278 store.UUID = Image.FullID;
279 db.Set(store);
280 db.Commit();
281
282
249 /* 283 /*
250 Image = new AssetBase(); 284 Image = new AssetBase();
251 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000008"); 285 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000008");
@@ -286,6 +320,32 @@ namespace OpenSim.Region.GridInterfaces.Local
286 db.Commit(); 320 db.Commit();
287 321
288 Image = new AssetBase(); 322 Image = new AssetBase();
323 Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");
324 Image.Name = "Shirt";
325 Image.Type = 5;
326 Image.InvType = 18;
327 this.LoadAsset(Image, false, "newshirt.dat");
328 store = new AssetStorage();
329 store.Data = Image.Data;
330 store.Name = Image.Name;
331 store.UUID = Image.FullID;
332 db.Set(store);
333 db.Commit();
334
335 Image = new AssetBase();
336 Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");
337 Image.Name = "Shirt";
338 Image.Type = 5;
339 Image.InvType = 18;
340 this.LoadAsset(Image, false, "newpants.dat");
341 store = new AssetStorage();
342 store.Data = Image.Data;
343 store.Name = Image.Name;
344 store.UUID = Image.FullID;
345 db.Set(store);
346 db.Commit();
347
348 Image = new AssetBase();
289 Image.FullID = new LLUUID("00000000-0000-2222-3333-000000000001"); 349 Image.FullID = new LLUUID("00000000-0000-2222-3333-000000000001");
290 Image.Name = "WelcomeNote"; 350 Image.Name = "WelcomeNote";
291 Image.Type = 7; 351 Image.Type = 7;
diff --git a/bin/assets/base_skin.dat b/bin/assets/base_skin.dat
index 2ebaed9..c51aeb8 100644
--- a/bin/assets/base_skin.dat
+++ b/bin/assets/base_skin.dat
@@ -47,6 +47,6 @@ parameters 26
47715 0 47715 0
48775 0 48775 0
49textures 3 49textures 3
500 00000000-0000-0000-9999-000000000003 500 00000000-0000-1111-9999-000000000012
515 00000000-0000-0000-9999-000000000004 515 00000000-0000-1111-9999-000000000010
526 00000000-0000-0000-9999-000000000005 526 00000000-0000-1111-9999-000000000011
diff --git a/bin/assets/femalebody.jp2 b/bin/assets/femalebody.jp2
new file mode 100644
index 0000000..a50498f
--- /dev/null
+++ b/bin/assets/femalebody.jp2
Binary files differ
diff --git a/bin/assets/femalebottom.jp2 b/bin/assets/femalebottom.jp2
new file mode 100644
index 0000000..88908c6
--- /dev/null
+++ b/bin/assets/femalebottom.jp2
Binary files differ
diff --git a/bin/assets/femaleface.jp2 b/bin/assets/femaleface.jp2
new file mode 100644
index 0000000..7bd0cb0
--- /dev/null
+++ b/bin/assets/femaleface.jp2
Binary files differ
diff --git a/bin/assets/newhair.dat b/bin/assets/newhair.dat
new file mode 100644
index 0000000..3c5a8c9
--- /dev/null
+++ b/bin/assets/newhair.dat
@@ -0,0 +1,63 @@
1LLWearable version 22
2New Hair
3
4 permissions 0
5 {
6 base_mask 7fffffff
7 owner_mask 7fffffff
8 group_mask 00000000
9 everyone_mask 00000000
10 next_owner_mask 00082000
11 creator_id a52db6d0-e96c-4454-85e5-3523722daa25
12 owner_id a52db6d0-e96c-4454-85e5-3523722daa25
13 last_owner_id 00000000-0000-0000-0000-000000000000
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 10
20 }
21type 2
22parameters 39
2316 0
2431 .5
25112 0
26113 0
27114 .5
28115 0
29119 .5
30130 .45
31131 .5
32132 .39
33133 .25
34134 .5
35135 .55
36136 .5
37137 .5
38140 0
39141 0
40142 0
41143 .13
42166 0
43167 0
44168 0
45169 0
46177 0
47181 .14
48182 .7
49183 .05
50184 0
51192 0
52674 -.3
53750 .7
54752 .5
55754 0
56755 .05
57757 -1
58762 0
59763 .55
60785 0
61789 0
62textures 1
634 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b
diff --git a/bin/assets/newpants.dat b/bin/assets/newpants.dat
new file mode 100644
index 0000000..96be614
--- /dev/null
+++ b/bin/assets/newpants.dat
@@ -0,0 +1,33 @@
1LLWearable version 22
2New Pants
3
4 permissions 0
5 {
6 base_mask 00000000
7 owner_mask 00000000
8 group_mask 00000000
9 everyone_mask 00000000
10 next_owner_mask 00000000
11 creator_id 11111111-1111-0000-0000-000100bba000
12 owner_id 11111111-1111-0000-0000-000100bba000
13 last_owner_id 00000000-0000-0000-0000-000000000000
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 10
20 }
21type 5
22parameters 9
23625 0
24638 0
25806 .8
26807 .2
27808 .2
28814 1
29815 .8
30816 0
31869 0
32textures 1
332 5748decc-f629-461c-9a36-a35a221fe21f
diff --git a/bin/assets/newshirt.dat b/bin/assets/newshirt.dat
new file mode 100644
index 0000000..bce62bc
--- /dev/null
+++ b/bin/assets/newshirt.dat
@@ -0,0 +1,34 @@
1LLWearable version 22
2New Shirt
3
4 permissions 0
5 {
6 base_mask 00000000
7 owner_mask 00000000
8 group_mask 00000000
9 everyone_mask 00000000
10 next_owner_mask 00000000
11 creator_id 11111111-1111-0000-0000-000100bba000
12 owner_id 11111111-1111-0000-0000-000100bba000
13 last_owner_id 00000000-0000-0000-0000-000000000000
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 10
20 }
21type 4
22parameters 10
23781 .78
24800 .65
25801 .82
26802 .78
27803 .5
28804 .5
29805 .6
30828 0
31840 0
32868 0
33textures 1
341 5748decc-f629-461c-9a36-a35a221fe21f