From 291eb48fb0338d80e3baeed65664d7a72fea1892 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 26 Aug 2007 17:57:25 +0000
Subject: Another attempt to fix the image sending bug (next week, I intend to
 rewrite the assetcache and asset server). Attempt to fix bug # 326. (crashing
 when using save-xml and hollow prims) Attempt to fix bug # 328 (limit of 50
 items in a folder)

---
 OpenSim/Framework/General/Interfaces/IAssetServer.cs  | 2 +-
 OpenSim/Framework/General/Interfaces/IClientAPI.cs    | 2 +-
 OpenSim/Framework/General/Types/PrimitiveBaseShape.cs | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/General')

diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index cbb5c36..cdce979 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Interfaces
     public interface IAssetReceiver
     {
         void AssetReceived(AssetBase asset, bool IsTexture);
-        void AssetNotFound(AssetBase asset);
+        void AssetNotFound(LLUUID assetID);
     }
 
     public interface IAssetPlugin
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 4dbe4e7..54136ac 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Interfaces
     public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID);
     public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID);
 
-    public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data);
+    public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal);
     public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
     public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName);
     public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID);
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 728767f..9a8adba 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -1,3 +1,4 @@
+using System.Xml.Serialization;
 using libsecondlife;
 using libsecondlife.Packets;
 
@@ -75,6 +76,7 @@ namespace OpenSim.Framework.Types
             }
         }
 
+        [XmlIgnore]
         public HollowShape HollowShape
         {
             get
-- 
cgit v1.1