aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-15 02:12:26 +0100
committerJustin Clark-Casey (justincc)2012-09-15 02:12:26 +0100
commit1ec84ac8b160c1a6ee903b832c75635d1219fe5a (patch)
treed729f94cdfbfa4a5f26d3127fa61c4ca20b36bd8 /OpenSim/Services/AssetService
parentFor FlotsamAssetCache, always update access times of cached scene assets befo... (diff)
downloadopensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.zip
opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.tar.gz
opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.tar.bz2
opensim-SC_OLD-1ec84ac8b160c1a6ee903b832c75635d1219fe5a.tar.xz
Add basic asset connector tests to check behaviour for normal, local and temporary assets.
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r--OpenSim/Services/AssetService/AssetServiceBase.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs
index 177c565..58ab052 100644
--- a/OpenSim/Services/AssetService/AssetServiceBase.cs
+++ b/OpenSim/Services/AssetService/AssetServiceBase.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.AssetService
84 84
85 m_Database = LoadPlugin<IAssetDataPlugin>(dllName); 85 m_Database = LoadPlugin<IAssetDataPlugin>(dllName);
86 if (m_Database == null) 86 if (m_Database == null)
87 throw new Exception("Could not find a storage interface in the given module"); 87 throw new Exception(string.Format("Could not find a storage interface in the module {0}", dllName));
88 88
89 m_Database.Initialise(connString); 89 m_Database.Initialise(connString);
90 90
@@ -96,7 +96,7 @@ namespace OpenSim.Services.AssetService
96 m_AssetLoader = LoadPlugin<IAssetLoader>(loaderName); 96 m_AssetLoader = LoadPlugin<IAssetLoader>(loaderName);
97 97
98 if (m_AssetLoader == null) 98 if (m_AssetLoader == null)
99 throw new Exception("Asset loader could not be loaded"); 99 throw new Exception(string.Format("Asset loader could not be loaded from {0}", loaderName));
100 } 100 }
101 } 101 }
102 } 102 }