fix merge issues

2026-08-10 03:06:05 +08:00 · 2015-11-01 03:25:36 +00:00
parent 72684592ba
commit 24472c3b67
2 changed files with 9 additions and 9 deletions
--- 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))