aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services
diff options
context:
space:
mode:
authordiva2009-05-15 05:00:25 +0000
committerdiva2009-05-15 05:00:25 +0000
commit5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch)
tree497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Framework/Communications/Services
parentsome sculpted prim geometry accuracy and meshing speed improvements (diff)
downloadopensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.zip
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.gz
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.bz2
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.xz
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing. Known problems: * HG asset transfers are borked for now * missing texture is missing * 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Framework/Communications/Services')
-rw-r--r--OpenSim/Framework/Communications/Services/HGInventoryService.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
index 77a6177..5334a21 100644
--- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs
+++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
@@ -40,6 +40,7 @@ using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
40using LLSDHelpers = OpenSim.Framework.Communications.Capabilities.LLSDHelpers; 40using LLSDHelpers = OpenSim.Framework.Communications.Capabilities.LLSDHelpers;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.HttpServer; 42using OpenSim.Framework.Servers.HttpServer;
43using OpenSim.Services.Interfaces;
43 44
44using OpenMetaverse.StructuredData; 45using OpenMetaverse.StructuredData;
45 46
@@ -58,7 +59,7 @@ namespace OpenSim.Framework.Communications.Services
58 59
59 // These two used for local access, standalone mode 60 // These two used for local access, standalone mode
60 private UserManagerBase m_userService = null; 61 private UserManagerBase m_userService = null;
61 IAssetDataPlugin m_assetProvider = null; 62 IAssetService m_assetProvider = null;
62 63
63 // These two used for remote access 64 // These two used for remote access
64 //string m_UserServerURL = string.Empty; 65 //string m_UserServerURL = string.Empty;
@@ -77,7 +78,7 @@ namespace OpenSim.Framework.Communications.Services
77 } 78 }
78 79
79 // Constructor for standalone mode 80 // Constructor for standalone mode
80 public HGInventoryService(InventoryServiceBase invService, IAssetDataPlugin assetService, UserManagerBase userService, IHttpServer httpserver, string thisurl) 81 public HGInventoryService(InventoryServiceBase invService, IAssetService assetService, UserManagerBase userService, IHttpServer httpserver, string thisurl)
81 { 82 {
82 m_userService = userService; 83 m_userService = userService;
83 m_assetProvider = assetService; 84 m_assetProvider = assetService;
@@ -708,7 +709,7 @@ namespace OpenSim.Framework.Communications.Services
708 return m_AssetClient.SyncGetAsset(assetID, isTexture); 709 return m_AssetClient.SyncGetAsset(assetID, isTexture);
709 // local call 710 // local call
710 else 711 else
711 return m_assetProvider.FetchAsset(assetID); 712 return m_assetProvider.Get(assetID.ToString());
712 } 713 }
713 714
714 void StoreAsset(AssetBase asset) 715 void StoreAsset(AssetBase asset)
@@ -718,7 +719,7 @@ namespace OpenSim.Framework.Communications.Services
718 m_AssetClient.StoreAsset(asset); 719 m_AssetClient.StoreAsset(asset);
719 // local call 720 // local call
720 else 721 else
721 m_assetProvider.CreateAsset(asset); 722 m_assetProvider.Store(asset);
722 } 723 }
723 724
724 #endregion Local vs Remote 725 #endregion Local vs Remote