aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Interfaces/IAssetServer.cs2
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs2
3 files changed, 4 insertions, 2 deletions
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
48 public interface IAssetReceiver 48 public interface IAssetReceiver
49 { 49 {
50 void AssetReceived(AssetBase asset, bool IsTexture); 50 void AssetReceived(AssetBase asset, bool IsTexture);
51 void AssetNotFound(AssetBase asset); 51 void AssetNotFound(LLUUID assetID);
52 } 52 }
53 53
54 public interface IAssetPlugin 54 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
92 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID); 92 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID);
93 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID); 93 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID);
94 94
95 public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data); 95 public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal);
96 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data); 96 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
97 public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName); 97 public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName);
98 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); 98 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 @@
1using System.Xml.Serialization;
1using libsecondlife; 2using libsecondlife;
2using libsecondlife.Packets; 3using libsecondlife.Packets;
3 4
@@ -75,6 +76,7 @@ namespace OpenSim.Framework.Types
75 } 76 }
76 } 77 }
77 78
79 [XmlIgnore]
78 public HollowShape HollowShape 80 public HollowShape HollowShape
79 { 81 {
80 get 82 get