6 files changed, 63 insertions, 23 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
                 Transfer.TransferInfo.TargetType = 0;
                 if (req.AssetRequestSource == 2)
                 {
-                    //Transfer.TransferInfo.Params = req.Params;
                     Transfer.TransferInfo.Params = new byte[20];
                     Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
                     int assType = (int)req.AssetInf.Type;
@@ -389,19 +388,19 @@ namespace OpenSim.Framework.Communications.Caches
                     {
                         chunk = new byte[req.AssetInf.Data.Length];
                         Array.Copy(req.AssetInf.Data, chunk, req.AssetInf.Data.Length);
+                        TransferPacket.TransferData.Data = chunk;
+                        TransferPacket.TransferData.Status = 1;
+                        req.RequestUser.OutPacket(TransferPacket);
                     }
                     else
                     {
                         chunk = new byte[1000];
                         Array.Copy(req.AssetInf.Data, chunk, 1000);
-                    }
 
-                    TransferPacket.TransferData.Data = chunk;
-                    TransferPacket.TransferData.Status = 0;
-                    req.RequestUser.OutPacket(TransferPacket);
+                        TransferPacket.TransferData.Data = chunk;
+                        TransferPacket.TransferData.Status = 0;
+                        req.RequestUser.OutPacket(TransferPacket);
 
-                    if (req.AssetInf.Data.Length > 1000)
-                    {
                         TransferPacket = new TransferPacketPacket();
                         TransferPacket.TransferData.Packet = 1;
                         TransferPacket.TransferData.ChannelType = 2;
@@ -411,7 +410,7 @@ namespace OpenSim.Framework.Communications.Caches
                         TransferPacket.TransferData.Data = chunk1;
                         TransferPacket.TransferData.Status = 1;
                         req.RequestUser.OutPacket(TransferPacket);
-                    }
+                    } 
                 }
 
             }
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
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002");
             item.inventoryDescription = "Plywood texture";
             item.inventoryName = "Plywood";
-            item.type = 0;
+            item.assetType = 0;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000003");
             item.inventoryDescription = "Rocks texture";
             item.inventoryName = "Rocks";
-            item.type = 0;
+            item.assetType = 0;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000001");
             item.inventoryDescription = "Bricks texture";
             item.inventoryName = "Bricks";
-            item.type = 0;
+            item.assetType = 0;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000004");
             item.inventoryDescription = "Granite texture";
             item.inventoryName = "Granite";
-            item.type = 0;
+            item.assetType = 0;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("00000000-0000-0000-9999-000000000005");
             item.inventoryDescription = "Hardwood texture";
             item.inventoryName = "Hardwood";
-            item.type = 0;
+            item.assetType = 0;
             item.parentFolderID = m_textureFolder.folderID;
             item.inventoryBasePermissions = 0x7FFFFFFF;
             item.inventoryEveryOnePermissions = 0x7FFFFFFF;
@@ -118,7 +118,8 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
             item.inventoryDescription = "Default Shape";
             item.inventoryName = "Default Shape";
-            item.type = 13;
+            item.assetType = 13;
+            item.invType = 18;
             item.parentFolderID = this.folderID;
             item.inventoryCurrentPermissions = 0;
             item.inventoryNextPermissions = 0;
@@ -131,12 +132,41 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
             item.inventoryDescription = "Default Skin";
             item.inventoryName = "Default Skin";
-            item.type = 13;
+            item.assetType = 13;
+            item.invType = 18;
             item.parentFolderID = this.folderID;
             item.inventoryCurrentPermissions = 0;
             item.inventoryNextPermissions = 0;
             this.Items.Add(item.inventoryID, item);
-            
+
+            item = new InventoryItemBase();
+            item.avatarID = libOwner;
+            item.creatorsID = libOwner;
+            item.inventoryID = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000");
+            item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111110");
+            item.inventoryDescription = "Default Shirt";
+            item.inventoryName = "Default Shirt";
+            item.assetType = 5;
+            item.invType = 18;
+            item.parentFolderID = this.folderID;
+            item.inventoryCurrentPermissions = 0;
+            item.inventoryNextPermissions = 0;
+            this.Items.Add(item.inventoryID, item);
+
+            item = new InventoryItemBase();
+            item.avatarID = libOwner;
+            item.creatorsID = libOwner;
+            item.inventoryID = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
+            item.assetID = new LLUUID("00000000-38f9-1111-024e-222222111120");
+            item.inventoryDescription = "Default Pants";
+            item.inventoryName = "Default Pants";
+            item.assetType = 5;
+            item.invType = 18;
+            item.parentFolderID = this.folderID;
+            item.inventoryCurrentPermissions = 0;
+            item.inventoryNextPermissions = 0;
+            this.Items.Add(item.inventoryID, item);
+
             item = new InventoryItemBase();
             item.avatarID = libOwner;
             item.creatorsID = libOwner;
@@ -144,7 +174,8 @@ namespace OpenSim.Framework.Communications.Caches
             item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001");
             item.inventoryDescription = "Welcome";
             item.inventoryName = "Welcome";
-            item.type = 7;
+            item.assetType = 7;
+            item.invType = 7;
             item.parentFolderID = this.folderID;
             item.inventoryCurrentPermissions = (1 << 15);
             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
             private LLUUID newAssetID;

             private LLUUID inventoryItemID;

             private BaseHttpServer httpListener;

-            private bool SaveImages = true;

+            private bool SaveImages = false;

             private string m_assetName = "";

 

             /// <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
                     item.inventoryName = (string)reader["inventoryName"];
                     item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
                     item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
-                    item.type = Convert.ToInt32(reader["type"].ToString());
+                    item.assetType = Convert.ToInt32(reader["type"].ToString());
 
                     rows.Add(item);
                 }
@@ -474,7 +474,7 @@ namespace OpenSim.Framework.Data.MySQL
             Dictionary<string, string> parameters = new Dictionary<string, string>();
             parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();
             parameters["?assetID"] = item.assetID.ToStringHyphenated();
-            parameters["?type"] = item.type.ToString();
+            parameters["?type"] = item.assetType.ToString();
             parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();
             parameters["?avatarID"] = item.avatarID.ToStringHyphenated();
             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
         /// <summary>
         /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
         /// </summary>
-        public int type;
+        public int assetType;
+        /// <summary>
+        /// The type of inventory item. (Can be slightly different to the asset type
+        /// </summary>
+        public int invType;
         /// <summary>
         /// The folder this item is contained in 
         /// </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
                 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
                 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
 
-                //defaultWearables[1].ItemID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9");
-                //defaultWearables[1].AssetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
+                defaultWearables[1].ItemID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9");
+                defaultWearables[1].AssetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
+
+                defaultWearables[4].ItemID = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000");
+                defaultWearables[4].AssetID = new LLUUID("00000000-38f9-1111-024e-222222111110");
+
+                defaultWearables[5].ItemID = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
+                defaultWearables[5].AssetID = new LLUUID("00000000-38f9-1111-024e-222222111120");
                 return defaultWearables;
             }
         }