From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 41 -------------------------
 1 file changed, 41 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 25bbd3a..d8928ee 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -120,53 +120,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="uuid">UUID.</param>
         public bool AddForInspection(UUID uuid)
         {
-<<<<<<< HEAD
             if (m_assetUuidsToInspect.Contains(uuid))
                 return false;
 
 //            m_log.DebugFormat("[UUID GATHERER]: Adding asset {0} for inspection", uuid);
 
             m_assetUuidsToInspect.Enqueue(uuid);
-=======
-            try
-            {               
-                assetUuids[assetUuid] = assetType;
-    
-                if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
-                {
-                    GetWearableAssetUuids(assetUuid, assetUuids);
-                }
-                else if ((sbyte)AssetType.Gesture == assetType)
-                {
-                    GetGestureAssetUuids(assetUuid, assetUuids);
-                }
-                else if ((sbyte)AssetType.Notecard == assetType)
-                {
-                    GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
-                }
-                else if ((sbyte)AssetType.LSLText == assetType)
-                {
-                    GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
-                }
-                else if ((sbyte)OpenSimAssetType.Material == assetType)
-                {
-                    GetMaterialAssetUuids(assetUuid, assetUuids);
-                }
-                else if ((sbyte)AssetType.Object == assetType)
-                {
-                    GetSceneObjectAssetUuids(assetUuid, assetUuids);
-                }
-            }
-            catch (Exception)
-            {
-                m_log.ErrorFormat(
-                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
-                    assetUuid, assetType);
-                throw;
-            }
-        }
->>>>>>> avn/ubitvar
-
             return true;
         }
         
-- 
cgit v1.1