diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Framework/AssetLandmark.cs | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/AssetLandmark.cs | 3 |
1 files changed, 3 insertions, 0 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(' '); |