diff options
| author | Melanie | 2010-01-28 02:07:18 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-28 02:07:18 +0000 |
| commit | 2d9b69c186238c7b5e578189f17ee0ab24dd3bb4 (patch) | |
| tree | d622a8f2ca6c1c3bf638c65ac05f1faa19fcc615 /OpenSim/Framework/Communications/Clients | |
| parent | Some merge fixups (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.zip opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.gz opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.bz2 opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Communications/Clients')
| -rw-r--r-- | OpenSim/Framework/Communications/Clients/RegionClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs index 5ceaf39..ee7dec8 100644 --- a/OpenSim/Framework/Communications/Clients/RegionClient.cs +++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs | |||
| @@ -83,7 +83,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
| 83 | } | 83 | } |
| 84 | // Add the regionhandle of the destination region | 84 | // Add the regionhandle of the destination region |
| 85 | ulong regionHandle = GetRegionHandle(region.RegionHandle); | 85 | ulong regionHandle = GetRegionHandle(region.RegionHandle); |
| 86 | args["destination_handle"] = OSD.FromString(regionHandle.ToString()); | 86 | args["destination_handle"] = OSD.FromString(regionHandle.ToString()); |
| 87 | args["teleport_flags"] = OSD.FromString(teleportFlags.ToString()); | 87 | args["teleport_flags"] = OSD.FromString(teleportFlags.ToString()); |
| 88 | 88 | ||
| 89 | string strBuffer = ""; | 89 | string strBuffer = ""; |