aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services
diff options
context:
space:
mode:
authordiva2009-04-03 16:08:07 +0000
committerdiva2009-04-03 16:08:07 +0000
commit7322e1921249f4b64a87a1825de1b3b5707b24d6 (patch)
treec337d13a5c84fe8ad2f5e79e4000412450f7b438 /OpenSim/Framework/Communications/Services
parent- adding -logconfig option to allow configuration of log4net from (diff)
downloadopensim-SC-7322e1921249f4b64a87a1825de1b3b5707b24d6.zip
opensim-SC-7322e1921249f4b64a87a1825de1b3b5707b24d6.tar.gz
opensim-SC-7322e1921249f4b64a87a1825de1b3b5707b24d6.tar.bz2
opensim-SC-7322e1921249f4b64a87a1825de1b3b5707b24d6.tar.xz
Added one more delegate to Caps, and a few guards, so that these objects can be used from more than just Scenes. Added the NewFileAgentInvengory cap to HGInventoryService.
Diffstat (limited to 'OpenSim/Framework/Communications/Services')
-rw-r--r--OpenSim/Framework/Communications/Services/HGInventoryService.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
index 7eaed89..d59d1ae 100644
--- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs
+++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
@@ -234,6 +234,11 @@ namespace OpenSim.Framework.Communications.Services
234 } 234 }
235 } 235 }
236 236
237 public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
238 {
239 AddItem(item);
240 }
241
237 public InventoryItemBase UpdateItem(InventoryItemBase item) 242 public InventoryItemBase UpdateItem(InventoryItemBase item)
238 { 243 {
239 m_log.DebugFormat("[HGStandaloneInvService]: Update item {0} from {1}", item.ID, item.Owner); 244 m_log.DebugFormat("[HGStandaloneInvService]: Update item {0} from {1}", item.ID, item.Owner);
@@ -372,6 +377,11 @@ namespace OpenSim.Framework.Communications.Services
372 return true; 377 return true;
373 } 378 }
374 379
380 public void PostAnAsset(AssetBase asset)
381 {
382 PostAsset(asset);
383 }
384
375 /// <summary> 385 /// <summary>
376 /// <see>CapsUpdatedInventoryItemAsset(IClientAPI, UUID, byte[])</see> 386 /// <see>CapsUpdatedInventoryItemAsset(IClientAPI, UUID, byte[])</see>
377 /// </summary> 387 /// </summary>
@@ -598,6 +608,10 @@ namespace OpenSim.Framework.Communications.Services
598 Caps caps = new Caps(null, httpServer, m_thisHostname, m_thisPort, authToken, userID, false, "Inventory"); 608 Caps caps = new Caps(null, httpServer, m_thisHostname, m_thisPort, authToken, userID, false, "Inventory");
599 caps.RegisterInventoryServiceHandlers("/" + authToken + "/InventoryCap/"); 609 caps.RegisterInventoryServiceHandlers("/" + authToken + "/InventoryCap/");
600 caps.ItemUpdatedCall = UpdateInventoryItemAsset; 610 caps.ItemUpdatedCall = UpdateInventoryItemAsset;
611 caps.AddNewInventoryItem = AddUploadedInventoryItem;
612 caps.AddNewAsset = PostAnAsset;
613 //caps.GetClient =
614
601 Hashtable capsHandlers = caps.CapsHandlers.CapsDetails; 615 Hashtable capsHandlers = caps.CapsHandlers.CapsDetails;
602 616
603 httpServer.AddStreamHandler(new RestDeserialiseSecureHandler<Guid, InventoryCollection>( 617 httpServer.AddStreamHandler(new RestDeserialiseSecureHandler<Guid, InventoryCollection>(