diff options
| author | John Hurliman | 2010-02-06 01:05:58 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-06 01:05:58 -0800 |
| commit | 5dc278b0d78c96b0593284e06ca3f7aa7088c71f (patch) | |
| tree | c8b5f9fa53cbc250bd52875ab2e818b473d20644 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |
| parent | Updated MySQL connection management to use the MySQL connection pooling. This... (diff) | |
| parent | endline fix 2 (diff) | |
| download | opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.zip opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.tar.gz opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.tar.bz2 opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-performance
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index 44458d1..fa3681a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |||
| @@ -436,12 +436,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | OSDMap resp = new OSDMap(2); | 438 | OSDMap resp = new OSDMap(2); |
| 439 | string reason = String.Empty; | 439 | string reason = String.Empty; |
| 440 | uint teleportFlags = 0; | 440 | uint teleportFlags = 0; |
| 441 | if (args.ContainsKey("teleport_flags")) | 441 | if (args.ContainsKey("teleport_flags")) |
| 442 | { | 442 | { |
| 443 | teleportFlags = args["teleport_flags"].AsUInteger(); | 443 | teleportFlags = args["teleport_flags"].AsUInteger(); |
| 444 | } | 444 | } |
| 445 | 445 | ||
| 446 | // This is the meaning of POST agent | 446 | // This is the meaning of POST agent |
| 447 | m_regionClient.AdjustUserInformation(aCircuit); | 447 | m_regionClient.AdjustUserInformation(aCircuit); |