From 84c2a72140822fc28da3590b48db392d132ef0ea Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 25 Mar 2007 20:23:06 +0000
Subject: Hopefully fixed the texture uploading and the crashing when a prim
 with a uploaded texture on it is moved.

---
 OpenSim.RegionServer/Assets/AssetCache.cs     | 18 ++++++++++++------
 OpenSim.RegionServer/Assets/InventoryCache.cs |  6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'OpenSim.RegionServer/Assets')

diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index c1b3472..3c28e1c 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -139,17 +139,23 @@ namespace OpenSim.Assets
 
         public void AddAsset(AssetBase asset)
         {
-            this._assetServer.UploadNewAsset(asset);
             if (asset.Type == 0)
             {
-                 //texture
-                TextureImage textur = new TextureImage(asset);
-                this.Textures.Add(textur.FullID, textur);
+                if (!this.Textures.ContainsKey(asset.FullID))
+                { //texture
+                    TextureImage textur = new TextureImage(asset);
+                    this.Textures.Add(textur.FullID, textur);
+                    this._assetServer.UploadNewAsset(asset);
+                }
             }
             else
             {
-                AssetInfo assetInf = new AssetInfo(asset);
-                this.Assets.Add(assetInf.FullID, assetInf);
+                if (!this.Assets.ContainsKey(asset.FullID))
+                {
+                    AssetInfo assetInf = new AssetInfo(asset);
+                    this.Assets.Add(assetInf.FullID, assetInf);
+                    this._assetServer.UploadNewAsset(asset);
+                }
             }
         }
 
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index 9e73fe5..f50047a 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -191,10 +191,10 @@ namespace OpenSim.Assets
                         InventoryReply.InventoryData[0].AssetID = Item.AssetID;
                         InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
                         InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].CreationDate = 1000;
+                        InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
                         InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
                         InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
-                        InventoryReply.InventoryData[0].Flags = 1;
+                        InventoryReply.InventoryData[0].Flags = 0;
                         InventoryReply.InventoryData[0].FolderID = Item.FolderID;
                         InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
                         InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
@@ -228,7 +228,7 @@ namespace OpenSim.Assets
             InventoryReply.InventoryData[0].CreationDate = 1000;
             InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
             InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
-            InventoryReply.InventoryData[0].Flags = 1;
+            InventoryReply.InventoryData[0].Flags = 0;
             InventoryReply.InventoryData[0].FolderID = Item.FolderID;
             InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
             InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
-- 
cgit v1.1