From 24472c3b67f0b79a8541093a63e2f0e859543117 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 1 Nov 2015 03:25:36 +0000
Subject:  fix merge issues

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 692ef06..8e10125 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -454,7 +454,6 @@ namespace OpenSim.Services.HypergridService
 
             EntityTransferContext ctx = new EntityTransferContext();
 
-            string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion);
             if (!m_SimulationService.QueryAccess(
                 destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), 
                 true, aCircuit.startpos, new List<UUID>(), ctx, out reason))
-- 
cgit v1.1