From 5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 29 Jul 2007 13:05:57 +0000
Subject: Deleting objects should now work. But beware they aren't send to your
 trash folder or anything so there is at the moment no way to recover deleted
 objects.

---
 OpenSim/Framework/Communications/Cache/AssetCache.cs | 1 +
 OpenSim/Framework/General/Interfaces/IClientAPI.cs   | 2 +-
 OpenSim/Framework/General/NullClientAPI.cs           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0c6d971..e4c01b3 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -272,6 +272,7 @@ namespace OpenSim.Framework.Communications.Caches
                 //inventory asset request
                 requestID = new LLUUID(transferRequest.TransferInfo.Params, 80);
                 source = 3;
+                Console.WriteLine("asset request " + requestID);
             }
             //check to see if asset is in local cache, if not we need to request it from asset server.
             //Console.WriteLine("asset request " + requestID);
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index c1d91d5..1e2889c 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Framework.Interfaces
         void SendWearables(AvatarWearable[] wearables);
         void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry);
         void SendStartPingCheck(byte seq);
-        void SendKillObject(ulong regionHandle, uint avatarLocalID);
+        void SendKillObject(ulong regionHandle, uint localID);
         void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId);
         void SendRegionHandshake(RegionInfo regionInfo);
         void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 45c1a14..c0b4e8a 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework
        public virtual void SendWearables(AvatarWearable[] wearables){}
        public virtual void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry) { }
        public virtual void SendStartPingCheck(byte seq){}
-       public virtual void SendKillObject(ulong regionHandle, uint avatarLocalID){}
+       public virtual void SendKillObject(ulong regionHandle, uint localID){}
        public virtual void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId){}
        public virtual void SendRegionHandshake(RegionInfo regionInfo){}
        public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}
-- 
cgit v1.1