aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs19
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs11
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs1
5 files changed, 26 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index addd20a..4cde5f6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -103,6 +103,15 @@ namespace OpenSim.Framework.Communications.Caches
103 } 103 }
104 } 104 }
105 105
106 public AssetBase GetTransactionAsset(LLUUID transactionID)
107 {
108 if (this.XferUploaders.ContainsKey(transactionID))
109 {
110 return XferUploaders[transactionID].GetAssetData();
111 }
112 return null;
113 }
114
106 // Nested Types 115 // Nested Types
107 public class AssetCapsUploader 116 public class AssetCapsUploader
108 { 117 {
@@ -298,6 +307,7 @@ namespace OpenSim.Framework.Communications.Caches
298 307
299 private void DoCreateItem() 308 private void DoCreateItem()
300 { 309 {
310 //really need to fix this call, if lbsa71 saw this he would die.
301 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset); 311 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
302 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId); 312 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId);
303 if (userInfo != null) 313 if (userInfo != null)
@@ -324,6 +334,15 @@ namespace OpenSim.Framework.Communications.Caches
324 { 334 {
325 335
326 } 336 }
337
338 public AssetBase GetAssetData()
339 {
340 if (m_finished)
341 {
342 return this.Asset;
343 }
344 return null;
345 }
327 } 346 }
328 347
329 public class NoteCardCapsUpdate 348 public class NoteCardCapsUpdate
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 6d85477..deef028 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -9,6 +9,10 @@ using Nini.Config;
9 9
10namespace OpenSim.Framework.Communications.Caches 10namespace OpenSim.Framework.Communications.Caches
11{ 11{
12 /// <summary>
13 /// Basically a hack to give us a Inventory library while we don't have a inventory server
14 /// once the server is fully implemented then should read the data from that
15 /// </summary>
12 public class LibraryRootFolder : InventoryFolder 16 public class LibraryRootFolder : InventoryFolder
13 { 17 {
14 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); 18 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 02c5f65..a599a19 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -182,17 +182,6 @@ namespace OpenSim.Framework.Communications.Caches
182 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo) 182 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
183 { 183 {
184 this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); 184 this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
185
186 //for now we manually create the root folder,
187 // but should be requesting all inventory from inventory server.
188 /* InventoryFolder folderInfo = new InventoryFolder();
189 folderInfo.agentID = userID;
190 folderInfo.folderID = userInfo.UserProfile.rootInventoryFolderID;
191 folderInfo.name = "My Inventory";
192 folderInfo.parentID = LLUUID.Zero;
193 folderInfo.type = 8;
194 folderInfo.version = 1;
195 userInfo.FolderReceive(userID, folderInfo);*/
196 } 185 }
197 186
198 /// <summary> 187 /// <summary>
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index a233d68..8337a81 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -87,6 +87,7 @@ namespace OpenSim.Framework.Interfaces
87 public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); 87 public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
88 public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID); 88 public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID);
89 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID); 89 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
90 public delegate void UpdateInventoryItemTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID);
90 91
91 public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data); 92 public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data);
92 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data); 93 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
@@ -141,6 +142,7 @@ namespace OpenSim.Framework.Interfaces
141 event FetchInventoryDescendents OnFetchInventoryDescendents; 142 event FetchInventoryDescendents OnFetchInventoryDescendents;
142 event FetchInventory OnFetchInventory; 143 event FetchInventory OnFetchInventory;
143 event RequestTaskInventory OnRequestTaskInventory; 144 event RequestTaskInventory OnRequestTaskInventory;
145 event UpdateInventoryItemTransaction OnUpdateInventoryItem;
144 event UDPAssetUploadRequest OnAssetUploadRequest; 146 event UDPAssetUploadRequest OnAssetUploadRequest;
145 event XferReceive OnXferReceive; 147 event XferReceive OnXferReceive;
146 event RequestXfer OnRequestXfer; 148 event RequestXfer OnRequestXfer;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 901b130..e6749fc 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Framework
58 public event FetchInventoryDescendents OnFetchInventoryDescendents; 58 public event FetchInventoryDescendents OnFetchInventoryDescendents;
59 public event FetchInventory OnFetchInventory; 59 public event FetchInventory OnFetchInventory;
60 public event RequestTaskInventory OnRequestTaskInventory; 60 public event RequestTaskInventory OnRequestTaskInventory;
61 public event UpdateInventoryItemTransaction OnUpdateInventoryItem;
61 public event UDPAssetUploadRequest OnAssetUploadRequest; 62 public event UDPAssetUploadRequest OnAssetUploadRequest;
62 public event XferReceive OnXferReceive; 63 public event XferReceive OnXferReceive;
63 public event RequestXfer OnRequestXfer; 64 public event RequestXfer OnRequestXfer;