diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/AgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index e7544b5..8780a49 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -149,6 +149,7 @@ 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 | ||
152 | List<UUID> features = new List<UUID>(); | 153 | List<UUID> features = new List<UUID>(); |
153 | 154 | ||
154 | if (args.ContainsKey("features")) | 155 | if (args.ContainsKey("features")) |
@@ -159,12 +160,18 @@ namespace OpenSim.Server.Handlers.Simulation | |||
159 | features.Add(new UUID(o.AsString())); | 160 | features.Add(new UUID(o.AsString())); |
160 | } | 161 | } |
161 | 162 | ||
163 | ======= | ||
164 | >>>>>>> avn/ubitvar | ||
162 | GridRegion destination = new GridRegion(); | 165 | GridRegion destination = new GridRegion(); |
163 | destination.RegionID = regionID; | 166 | destination.RegionID = regionID; |
164 | 167 | ||
165 | string reason; | 168 | string reason; |
166 | string version; | 169 | string version; |
170 | <<<<<<< HEAD | ||
167 | bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, features, out version, out reason); | 171 | 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 | ||
168 | 175 | ||
169 | responsedata["int_response_code"] = HttpStatusCode.OK; | 176 | responsedata["int_response_code"] = HttpStatusCode.OK; |
170 | 177 | ||
@@ -262,7 +269,16 @@ namespace OpenSim.Server.Handlers.Simulation | |||
262 | httpResponse.KeepAlive = false; | 269 | httpResponse.KeepAlive = false; |
263 | Encoding encoding = Encoding.UTF8; | 270 | Encoding encoding = Encoding.UTF8; |
264 | 271 | ||
272 | <<<<<<< HEAD | ||
265 | if (httpRequest.ContentType != "application/json") | 273 | 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 | ||
266 | { | 282 | { |
267 | httpResponse.StatusCode = 406; | 283 | httpResponse.StatusCode = 406; |
268 | return encoding.GetBytes("false"); | 284 | return encoding.GetBytes("false"); |
@@ -448,7 +464,30 @@ namespace OpenSim.Server.Handlers.Simulation | |||
448 | protected virtual bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, | 464 | protected virtual bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, |
449 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) | 465 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) |
450 | { | 466 | { |
467 | <<<<<<< HEAD | ||
451 | return m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); | 468 | return m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); |
469 | ======= | ||
470 | reason = String.Empty; | ||
471 | if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0) | ||
472 | { | ||
473 | Util.FireAndForget(x => | ||
474 | { | ||
475 | string r; | ||
476 | m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r); | ||
477 | m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r); | ||
478 | }); | ||
479 | |||
480 | return true; | ||
481 | } | ||
482 | else | ||
483 | { | ||
484 | |||
485 | bool ret = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason); | ||
486 | m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason); | ||
487 | return ret; | ||
488 | } | ||
489 | |||
490 | >>>>>>> avn/ubitvar | ||
452 | } | 491 | } |
453 | } | 492 | } |
454 | 493 | ||