aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-25 18:11:56 +0000
committerJustin Clarke Casey2007-12-25 18:11:56 +0000
commite9efd5bee204a92b3969ea3beeba89243d13e47a (patch)
tree1d09701a590b2c6b16a9faa57bbc219d5a1f31d3 /OpenSim/Framework
parent* Added some ugly hackish code to the user server to start implementing the n... (diff)
downloadopensim-SC_OLD-e9efd5bee204a92b3969ea3beeba89243d13e47a.zip
opensim-SC_OLD-e9efd5bee204a92b3969ea3beeba89243d13e47a.tar.gz
opensim-SC_OLD-e9efd5bee204a92b3969ea3beeba89243d13e47a.tar.bz2
opensim-SC_OLD-e9efd5bee204a92b3969ea3beeba89243d13e47a.tar.xz
Small non-functional inventory changes
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs22
1 files changed, 11 insertions, 11 deletions
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;
38namespace OpenSim.Region.Capabilities 38namespace OpenSim.Region.Capabilities
39{ 39{
40 public delegate void UpLoadedAsset( 40 public delegate void UpLoadedAsset(
41 string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, byte[] data, 41 string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder,
42 string inventoryType, string assetType); 42 byte[] data, string inventoryType, string assetType);
43 43
44 public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data); 44 public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data);
45 45
46 public delegate LLUUID UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data); 46 public delegate void UpdateTaskScript(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data);
47 47
48 public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item); 48 public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item);
49 49
50 public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data); 50 public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data);
51 51
52 public delegate LLUUID TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID, 52 public delegate void TaskScriptUpdatedCallback(LLUUID userID, LLUUID itemID, LLUUID primID,
53 bool isScriptRunning, byte[] data); 53 bool isScriptRunning, byte[] data);
54 54
55 public class Caps 55 public class Caps
@@ -349,7 +349,10 @@ namespace OpenSim.Region.Capabilities
349 uploadResponse.uploader = uploaderURL; 349 uploadResponse.uploader = uploaderURL;
350 uploadResponse.state = "upload"; 350 uploadResponse.state = "upload";
351 351
352 MainLog.Instance.Verbose("CAPS", "NoteCardAgentInventory response: {0}", LLSDHelpers.SerialiseLLSDReply(uploadResponse)); 352// MainLog.Instance.Verbose(
353// "CAPS",
354// "NoteCardAgentInventory response: {0}",
355// LLSDHelpers.SerialiseLLSDReply(uploadResponse));
353 356
354 return LLSDHelpers.SerialiseLLSDReply(uploadResponse); 357 return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
355 } 358 }
@@ -461,14 +464,12 @@ namespace OpenSim.Region.Capabilities
461 /// <param name="primID">Prim containing item to update</param> 464 /// <param name="primID">Prim containing item to update</param>
462 /// <param name="isScriptRunning">Signals whether the script to update is currently running</param> 465 /// <param name="isScriptRunning">Signals whether the script to update is currently running</param>
463 /// <param name="data">New asset data</param> 466 /// <param name="data">New asset data</param>
464 public LLUUID TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data) 467 public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data)
465 { 468 {
466 if (TaskScriptUpdatedCall != null) 469 if (TaskScriptUpdatedCall != null)
467 { 470 {
468 return TaskScriptUpdatedCall(m_agentID, itemID, primID, isScriptRunning, data); 471 TaskScriptUpdatedCall(m_agentID, itemID, primID, isScriptRunning, data);
469 } 472 }
470
471 return LLUUID.Zero;
472 } 473 }
473 474
474 public class AssetUploader 475 public class AssetUploader
@@ -661,11 +662,10 @@ namespace OpenSim.Region.Capabilities
661 662
662 string res = ""; 663 string res = "";
663 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); 664 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
664 LLUUID assetID = LLUUID.Zero;
665 665
666 if (OnUpLoad != null) 666 if (OnUpLoad != null)
667 { 667 {
668 assetID = OnUpLoad(inventoryItemID, primID, isScriptRunning, data); 668 OnUpLoad(inventoryItemID, primID, isScriptRunning, data);
669 } 669 }
670 670
671 uploadComplete.item_id = inventoryItemID; 671 uploadComplete.item_id = inventoryItemID;