diff options
| author | Melanie | 2010-02-08 22:11:38 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-08 22:11:38 +0000 |
| commit | c8f3bb56ff20493b9f51a123a1d89e876e0cab75 (patch) | |
| tree | 0f878d1eb21f821f517ebe8170776023952e6e2c /OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.zip opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.tar.gz opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.tar.bz2 opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion')
| -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 0357c60..b7f3adf 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |||
| @@ -435,12 +435,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
| 435 | } | 435 | } |
| 436 | 436 | ||
| 437 | OSDMap resp = new OSDMap(2); | 437 | OSDMap resp = new OSDMap(2); |
| 438 | string reason = String.Empty; | 438 | string reason = String.Empty; |
| 439 | uint teleportFlags = 0; | 439 | uint teleportFlags = 0; |
| 440 | if (args.ContainsKey("teleport_flags")) | 440 | if (args.ContainsKey("teleport_flags")) |
| 441 | { | 441 | { |
| 442 | teleportFlags = args["teleport_flags"].AsUInteger(); | 442 | teleportFlags = args["teleport_flags"].AsUInteger(); |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | // This is the meaning of POST agent | 445 | // This is the meaning of POST agent |
| 446 | m_regionClient.AdjustUserInformation(aCircuit); | 446 | m_regionClient.AdjustUserInformation(aCircuit); |