diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/AgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 8780a49..30418be 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -149,7 +149,6 @@ namespace OpenSim.Server.Handlers.Simulation | |||
149 | if (args.ContainsKey("my_version")) | 149 | if (args.ContainsKey("my_version")) |
150 | theirVersion = args["my_version"].AsString(); | 150 | theirVersion = args["my_version"].AsString(); |
151 | 151 | ||
152 | <<<<<<< HEAD | ||
153 | List<UUID> features = new List<UUID>(); | 152 | List<UUID> features = new List<UUID>(); |
154 | 153 | ||
155 | if (args.ContainsKey("features")) | 154 | if (args.ContainsKey("features")) |
@@ -160,18 +159,12 @@ namespace OpenSim.Server.Handlers.Simulation | |||
160 | features.Add(new UUID(o.AsString())); | 159 | features.Add(new UUID(o.AsString())); |
161 | } | 160 | } |
162 | 161 | ||
163 | ======= | ||
164 | >>>>>>> avn/ubitvar | ||
165 | GridRegion destination = new GridRegion(); | 162 | GridRegion destination = new GridRegion(); |
166 | destination.RegionID = regionID; | 163 | destination.RegionID = regionID; |
167 | 164 | ||
168 | string reason; | 165 | string reason; |
169 | string version; | 166 | string version; |
170 | <<<<<<< HEAD | ||
171 | bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, features, out version, out reason); | 167 | bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, features, out version, out reason); |
172 | ======= | ||
173 | bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, out version, out reason); | ||
174 | >>>>>>> avn/ubitvar | ||
175 | 168 | ||
176 | responsedata["int_response_code"] = HttpStatusCode.OK; | 169 | responsedata["int_response_code"] = HttpStatusCode.OK; |
177 | 170 | ||
@@ -269,16 +262,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
269 | httpResponse.KeepAlive = false; | 262 | httpResponse.KeepAlive = false; |
270 | Encoding encoding = Encoding.UTF8; | 263 | Encoding encoding = Encoding.UTF8; |
271 | 264 | ||
272 | <<<<<<< HEAD | ||
273 | if (httpRequest.ContentType != "application/json") | 265 | if (httpRequest.ContentType != "application/json") |
274 | ======= | ||
275 | Stream inputStream = null; | ||
276 | if ((httpRequest.ContentType == "application/x-gzip" || httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip")) | ||
277 | inputStream = new GZipStream(request, CompressionMode.Decompress); | ||
278 | else if (httpRequest.ContentType == "application/json") | ||
279 | inputStream = request; | ||
280 | else // no go | ||
281 | >>>>>>> avn/ubitvar | ||
282 | { | 266 | { |
283 | httpResponse.StatusCode = 406; | 267 | httpResponse.StatusCode = 406; |
284 | return encoding.GetBytes("false"); | 268 | return encoding.GetBytes("false"); |
@@ -464,16 +448,13 @@ namespace OpenSim.Server.Handlers.Simulation | |||
464 | protected virtual bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, | 448 | protected virtual bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, |
465 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) | 449 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) |
466 | { | 450 | { |
467 | <<<<<<< HEAD | ||
468 | return m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); | ||
469 | ======= | ||
470 | reason = String.Empty; | 451 | reason = String.Empty; |
471 | if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0) | 452 | if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0) |
472 | { | 453 | { |
473 | Util.FireAndForget(x => | 454 | Util.FireAndForget(x => |
474 | { | 455 | { |
475 | string r; | 456 | string r; |
476 | m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r); | 457 | m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out r); |
477 | m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r); | 458 | m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r); |
478 | }); | 459 | }); |
479 | 460 | ||
@@ -482,12 +463,10 @@ namespace OpenSim.Server.Handlers.Simulation | |||
482 | else | 463 | else |
483 | { | 464 | { |
484 | 465 | ||
485 | bool ret = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason); | 466 | bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); |
486 | m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason); | 467 | m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason); |
487 | return ret; | 468 | return ret; |
488 | } | 469 | } |
489 | |||
490 | >>>>>>> avn/ubitvar | ||
491 | } | 470 | } |
492 | } | 471 | } |
493 | 472 | ||