Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 23 insertions, 10 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
index f55ba7e..fcb544f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
@@ -26,19 +26,32 @@
  */
 
 using System;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 
-namespace OpenSim.Region.ScriptEngine.Shared
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+
+namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 {
-    [Serializable]
-    public class ScriptException : Exception
+    public class HGUuidGatherer : UuidGatherer
     {
-        public ScriptException() : base() {}
-
-        public ScriptException(string message) : base(message) {}
+        protected string m_assetServerURL;
+        protected HGAssetMapper m_assetMapper;
 
-        public ScriptException(string message, Exception innerException) : base(message, innerException) {}
+        public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache)
+        {
+            m_assetMapper = assMap;
+            m_assetServerURL = assetServerURL;
+        }
 
-        public ScriptException(SerializationInfo info, StreamingContext context) :base(info, context) {}
+        protected override AssetBase GetAsset(UUID uuid)
+        {
+            if (string.Empty == m_assetServerURL)
+                return m_assetCache.Get(uuid.ToString());
+            else
+                return m_assetMapper.FetchAsset(m_assetServerURL, uuid);
+        }
     }
-}
\ No newline at end of file
+}