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/Scene.PacketHandlers.cs | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3d9c028..20767e5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -551,7 +551,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder)
         {
-<<<<<<< HEAD
             try
             {
                 SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
@@ -562,10 +561,7 @@ namespace OpenSim.Region.Framework.Scenes
                     string.Format(
                         "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}.  Exception  ", e));
             }
-=======
             Thread.Sleep(20);
-            SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
->>>>>>> avn/ubitvar
         }
 
         void SendInventoryComplete(IAsyncResult iar)
-- 
cgit v1.1