aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie2010-06-07 00:44:36 +0100
committerMelanie2010-06-07 00:44:36 +0100
commit74d62901c89cd8d46c3ec912bf250b9af01eb2bb (patch)
tree36e302ea764addda3ef8451b98222c5537b613a5 /OpenSim/Services/Interfaces
parentAdd a call to SOG.ResumeScripts() after region crossing / teleport (diff)
parentAdd a call to SOG.ResumeScripts() after region crossing / teleport (diff)
downloadopensim-SC_OLD-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.zip
opensim-SC_OLD-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.gz
opensim-SC_OLD-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.bz2
opensim-SC_OLD-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IGridUserService.cs2
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"))