diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AssetLandmark.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs index f433235..103f756 100644 --- a/OpenSim/Framework/AssetLandmark.cs +++ b/OpenSim/Framework/AssetLandmark.cs | |||
@@ -35,6 +35,7 @@ namespace OpenSim.Framework | |||
35 | public Vector3 Position; | 35 | public Vector3 Position; |
36 | public ulong RegionHandle; | 36 | public ulong RegionHandle; |
37 | public UUID RegionID; | 37 | public UUID RegionID; |
38 | public string Gatekeeper = string.Empty; | ||
38 | public int Version; | 39 | public int Version; |
39 | 40 | ||
40 | public AssetLandmark(AssetBase a) | 41 | public AssetLandmark(AssetBase a) |
@@ -51,6 +52,8 @@ namespace OpenSim.Framework | |||
51 | string[] parts = temp.Split('\n'); | 52 | string[] parts = temp.Split('\n'); |
52 | int.TryParse(parts[0].Substring(17, 1), out Version); | 53 | int.TryParse(parts[0].Substring(17, 1), out Version); |
53 | UUID.TryParse(parts[1].Substring(10, 36), out RegionID); | 54 | UUID.TryParse(parts[1].Substring(10, 36), out RegionID); |
55 | if (parts.Length >= 5) | ||
56 | Gatekeeper = parts[4].Replace("gatekeeper ", ""); | ||
54 | // The position is a vector with spaces as separators ("10.3 32.5 43"). | 57 | // The position is a vector with spaces as separators ("10.3 32.5 43"). |
55 | // Parse each scalar separately to take into account the system's culture setting. | 58 | // Parse each scalar separately to take into account the system's culture setting. |
56 | string[] scalars = parts[2].Substring(10, parts[2].Length - 10).Split(' '); | 59 | string[] scalars = parts[2].Substring(10, parts[2].Length - 10).Split(' '); |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 137f432..659d42f 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Framework | |||
83 | IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags); | 83 | IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags); |
84 | 84 | ||
85 | public delegate void TeleportLandmarkRequest( | 85 | public delegate void TeleportLandmarkRequest( |
86 | IClientAPI remoteClient, UUID regionID, Vector3 position); | 86 | IClientAPI remoteClient, AssetLandmark lm); |
87 | 87 | ||
88 | public delegate void DisconnectUser(); | 88 | public delegate void DisconnectUser(); |
89 | 89 | ||