From e9efd5bee204a92b3969ea3beeba89243d13e47a Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 25 Dec 2007 18:11:56 +0000
Subject: Small non-functional inventory changes

---
 .../Framework/Communications/Capabilities/Caps.cs  | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Framework/Communications/Capabilities')

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a72abbe..e00f49d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -38,18 +38,18 @@ using OpenSim.Framework.Servers;
 namespace OpenSim.Region.Capabilities
 {
     public delegate void UpLoadedAsset(
-        string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, byte[] data,
-        string inventoryType, string assetType);
+        string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, 
+        byte[] data, string inventoryType, string assetType);
 
     public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data);
     
-    public delegate LLUUID UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data);
+    public delegate void UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data);
 
     public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item);
 
     public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data);
     
-    public delegate LLUUID TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID, 
+    public delegate void TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID, 
                                                      bool isScriptRunning, byte[] data);
 
     public class Caps
@@ -349,7 +349,10 @@ namespace OpenSim.Region.Capabilities
             uploadResponse.uploader = uploaderURL;
             uploadResponse.state = "upload";
 
-            MainLog.Instance.Verbose("CAPS", "NoteCardAgentInventory response: {0}", LLSDHelpers.SerialiseLLSDReply(uploadResponse));
+//            MainLog.Instance.Verbose(
+//                "CAPS", 
+//                "NoteCardAgentInventory response: {0}", 
+//                LLSDHelpers.SerialiseLLSDReply(uploadResponse));
             
             return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
         }
@@ -461,14 +464,12 @@ namespace OpenSim.Region.Capabilities
         /// <param name="primID">Prim containing item to update</param>
         /// <param name="isScriptRunning">Signals whether the script to update is currently running</param>
         /// <param name="data">New asset data</param>        
-        public LLUUID TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data)
+        public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data)
         {
             if (TaskScriptUpdatedCall != null)
             {
-                return TaskScriptUpdatedCall(m_agentID, itemID, primID, isScriptRunning, data);
+                TaskScriptUpdatedCall(m_agentID, itemID, primID, isScriptRunning, data);
             }
-            
-            return LLUUID.Zero;
         }
 
         public class AssetUploader
@@ -661,11 +662,10 @@ namespace OpenSim.Region.Capabilities
                     
                     string res = "";
                     LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
-                    LLUUID assetID = LLUUID.Zero;
 
                     if (OnUpLoad != null)
                     {
-                        assetID = OnUpLoad(inventoryItemID, primID, isScriptRunning, data);
+                        OnUpLoad(inventoryItemID, primID, isScriptRunning, data);
                     }
 
                     uploadComplete.item_id = inventoryItemID;                
-- 
cgit v1.1