Merge branch 'master' into careminster-presence-refactor

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
                     if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
                     {
                         if (replyData["result"] is Dictionary<string, object>)
-                        {
                             guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]);
-                        }
                     }
 
                     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
                 Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
 
             if (kvp.ContainsKey("LastRegionID"))
-                UUID.TryParse(kvp["LastRegionID"].ToString(), out HomeRegionID);
+                UUID.TryParse(kvp["LastRegionID"].ToString(), out LastRegionID);
             if (kvp.ContainsKey("LastPosition"))
                 Vector3.TryParse(kvp["LastPosition"].ToString(), out LastPosition);
             if (kvp.ContainsKey("LastLookAt"))