diff options
| author | Melanie | 2010-06-07 00:44:36 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-07 00:44:36 +0100 |
| commit | 74d62901c89cd8d46c3ec912bf250b9af01eb2bb (patch) | |
| tree | 36e302ea764addda3ef8451b98222c5537b613a5 /OpenSim/Services/Interfaces | |
| parent | Add a call to SOG.ResumeScripts() after region crossing / teleport (diff) | |
| parent | Add a call to SOG.ResumeScripts() after region crossing / teleport (diff) | |
| download | opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.zip opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.gz opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.bz2 opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridUserService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index e629dff..95ce5e8 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs | |||
| @@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces | |||
| 65 | Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt); | 65 | Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt); |
| 66 | 66 | ||
| 67 | if (kvp.ContainsKey("LastRegionID")) | 67 | if (kvp.ContainsKey("LastRegionID")) |
| 68 | UUID.TryParse(kvp["LastRegionID"].ToString(), out HomeRegionID); | 68 | UUID.TryParse(kvp["LastRegionID"].ToString(), out LastRegionID); |
| 69 | if (kvp.ContainsKey("LastPosition")) | 69 | if (kvp.ContainsKey("LastPosition")) |
| 70 | Vector3.TryParse(kvp["LastPosition"].ToString(), out LastPosition); | 70 | Vector3.TryParse(kvp["LastPosition"].ToString(), out LastPosition); |
| 71 | if (kvp.ContainsKey("LastLookAt")) | 71 | if (kvp.ContainsKey("LastLookAt")) |