diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/ScriptException.cs (renamed from OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs) | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs b/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs index fcb544f..f55ba7e 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs | |||
@@ -26,32 +26,19 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Runtime.Serialization; |
30 | 30 | ||
31 | using OpenSim.Framework; | 31 | namespace OpenSim.Region.ScriptEngine.Shared |
32 | using OpenSim.Region.Framework.Scenes; | ||
33 | using OpenSim.Services.Interfaces; | ||
34 | using OpenMetaverse; | ||
35 | |||
36 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | ||
37 | { | 32 | { |
38 | public class HGUuidGatherer : UuidGatherer | 33 | [Serializable] |
34 | public class ScriptException : Exception | ||
39 | { | 35 | { |
40 | protected string m_assetServerURL; | 36 | public ScriptException() : base() {} |
41 | protected HGAssetMapper m_assetMapper; | 37 | |
38 | public ScriptException(string message) : base(message) {} | ||
42 | 39 | ||
43 | public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache) | 40 | public ScriptException(string message, Exception innerException) : base(message, innerException) {} |
44 | { | ||
45 | m_assetMapper = assMap; | ||
46 | m_assetServerURL = assetServerURL; | ||
47 | } | ||
48 | 41 | ||
49 | protected override AssetBase GetAsset(UUID uuid) | 42 | public ScriptException(SerializationInfo info, StreamingContext context) :base(info, context) {} |
50 | { | ||
51 | if (string.Empty == m_assetServerURL) | ||
52 | return m_assetCache.Get(uuid.ToString()); | ||
53 | else | ||
54 | return m_assetMapper.FetchAsset(m_assetServerURL, uuid); | ||
55 | } | ||
56 | } | 43 | } |
57 | } | 44 | } \ No newline at end of file |