aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-06-05 09:39:09 -0700
committerDiva Canto2010-06-05 09:39:09 -0700
commitab3afd5f42593cb6f5475af36accdd1f01962fd1 (patch)
tree797ef9fc37879e0602545aee76e1789fadd3ed17 /OpenSim/Services
parentBug fix: update the list of friends upon MakeRoot, because child agents don't... (diff)
downloadopensim-SC-ab3afd5f42593cb6f5475af36accdd1f01962fd1.zip
opensim-SC-ab3afd5f42593cb6f5475af36accdd1f01962fd1.tar.gz
opensim-SC-ab3afd5f42593cb6f5475af36accdd1f01962fd1.tar.bz2
opensim-SC-ab3afd5f42593cb6f5475af36accdd1f01962fd1.tar.xz
* Bug fix in TP home: typo in unpacking of GridUserInfo.
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs2
-rw-r--r--OpenSim/Services/Interfaces/IGridUserService.cs2
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index 600ddfd..935ebb1 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -206,9 +206,7 @@ namespace OpenSim.Services.Connectors
206 if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null)) 206 if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
207 { 207 {
208 if (replyData["result"] is Dictionary<string, object>) 208 if (replyData["result"] is Dictionary<string, object>)
209 {
210 guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]); 209 guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]);
211 }
212 } 210 }
213 211
214 return guinfo; 212 return guinfo;
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"))