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)

---
 .../Simulation/SimulationServiceConnector.cs       | 24 ++--------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 28b6de7..493d7e0 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -283,13 +283,8 @@ namespace OpenSim.Services.Connectors.Simulation
         }
 
 
-<<<<<<< HEAD
+
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason)
-=======
-        /// <summary>
-        /// </summary>
-        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, out string version, out string reason)
->>>>>>> avn/ubitvar
         {
             reason = "Failed to contact destination";
             version = "Unknown";
@@ -306,7 +301,6 @@ namespace OpenSim.Services.Connectors.Simulation
             request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
             request.Add("position", OSD.FromString(position.ToString()));
             request.Add("my_version", OSD.FromString(myversion));
-<<<<<<< HEAD
 
             OSDArray features = new OSDArray();
             foreach (UUID feature in featuresAvailable)
@@ -314,8 +308,6 @@ namespace OpenSim.Services.Connectors.Simulation
 
             request.Add("features", features);
 
-=======
->>>>>>> avn/ubitvar
             if (agentHomeURI != null)
                 request.Add("agent_home_uri", OSD.FromString(agentHomeURI));
 
@@ -366,8 +358,6 @@ namespace OpenSim.Services.Connectors.Simulation
                     return false;
                 }
 
-<<<<<<< HEAD
-
                 featuresAvailable.Clear();
 
                 if (result.ContainsKey("features"))
@@ -377,12 +367,6 @@ namespace OpenSim.Services.Connectors.Simulation
                     foreach (OSD o in array)
                         featuresAvailable.Add(new UUID(o.AsString()));
                 }
-=======
-                OSDMap resp = (OSDMap)result["_Result"];
-                success = resp["success"].AsBoolean();
-                reason = resp["reason"].AsString();
->>>>>>> avn/ubitvar
-
                 return success;
             }
             catch (Exception e)
@@ -467,17 +451,13 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_name"] = OSD.FromString(destination.RegionName);
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
 
-<<<<<<< HEAD
+
                 OSDMap result = WebUtil.PostToService(uri, args, 40000, false);
 
                 if (result == null)
                     return false;
                 bool success = result["success"].AsBoolean();
                 if (!success)
-=======
-                OSDMap response = WebUtil.PostToService(uri, args, 40000);
-                if (response["Success"] == "False")
->>>>>>> avn/ubitvar
                     return false;
             }
             catch (Exception e)
-- 
cgit v1.1