aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/FSAssetService/FSAssetService.cs
diff options
context:
space:
mode:
authorAliciaRaven2015-08-02 20:02:36 +0100
committerAliciaRaven2015-08-02 20:02:36 +0100
commitce62824b1f57308ca463386783c907d4d8c5696f (patch)
tree1795e4d3efd78580b9292c6e66863bd2075b5e34 /OpenSim/Services/FSAssetService/FSAssetService.cs
parentosKey2Name returns now correct values for HG users who are not on the region. (diff)
downloadopensim-SC-ce62824b1f57308ca463386783c907d4d8c5696f.zip
opensim-SC-ce62824b1f57308ca463386783c907d4d8c5696f.tar.gz
opensim-SC-ce62824b1f57308ca463386783c907d4d8c5696f.tar.bz2
opensim-SC-ce62824b1f57308ca463386783c907d4d8c5696f.tar.xz
Add HGFSAssetService to the HypergridService to provide HG support for FSAssets.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/FSAssetService/FSAssetService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
index c2e379b..1bab687 100644
--- a/OpenSim/Services/FSAssetService/FSAssetService.cs
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -330,7 +330,7 @@ namespace OpenSim.Services.FSAssetService
330 return Path.Combine(HashToPath(hash), hash); 330 return Path.Combine(HashToPath(hash), hash);
331 } 331 }
332 332
333 public AssetBase Get(string id) 333 public virtual AssetBase Get(string id)
334 { 334 {
335 string hash; 335 string hash;
336 336
@@ -434,13 +434,13 @@ namespace OpenSim.Services.FSAssetService
434 } 434 }
435 } 435 }
436 436
437 public AssetMetadata GetMetadata(string id) 437 public virtual AssetMetadata GetMetadata(string id)
438 { 438 {
439 string hash; 439 string hash;
440 return m_DataConnector.Get(id, out hash); 440 return m_DataConnector.Get(id, out hash);
441 } 441 }
442 442
443 public byte[] GetData(string id) 443 public virtual byte[] GetData(string id)
444 { 444 {
445 string hash; 445 string hash;
446 if (m_DataConnector.Get(id, out hash) == null) 446 if (m_DataConnector.Get(id, out hash) == null)
@@ -521,7 +521,7 @@ namespace OpenSim.Services.FSAssetService
521 521
522 } 522 }
523 523
524 public string Store(AssetBase asset) 524 public virtual string Store(AssetBase asset)
525 { 525 {
526 return Store(asset, false); 526 return Store(asset, false);
527 } 527 }
@@ -606,7 +606,7 @@ namespace OpenSim.Services.FSAssetService
606// return true; 606// return true;
607 } 607 }
608 608
609 public bool Delete(string id) 609 public virtual bool Delete(string id)
610 { 610 {
611 m_DataConnector.Delete(id); 611 m_DataConnector.Delete(id);
612 612