Fix parsing LLSD-XML login response parsing on Second Life after chan…

…ges on 6 Dec 2021
cinderblocks · Dec 6, 2021 · 3f4d7bd · 3f4d7bd
1 parent ff8c24d
commit 3f4d7bd
Showing 1 changed file with 37 additions and 18 deletions.
diff --git a/LibreMetaverse/Login.cs b/LibreMetaverse/Login.cs
@@ -466,31 +466,50 @@ public void Parse(Hashtable reply)
             {
                 Logger.Log("Login server returned (some) invalid data: " + e.Message, Helpers.LogLevel.Warning);
             }
-            if (!Success)
-                return;
+            if (!Success) { return; }
 
             // Home
             if (reply.ContainsKey("home"))
             {
-                var osdHome = OSDParser.DeserializeLLSDNotation(reply["home"].ToString());
-
-                if (osdHome.Type == OSDType.Map)
+                try
                 {
-                    var home = (OSDMap)osdHome;
-
-                    OSD homeRegion;
-                    if (home.TryGetValue("region_handle", out homeRegion) && homeRegion.Type == OSDType.Array)
+                    if (reply?["home"] is Hashtable map)
                     {
-                        var homeArray = (OSDArray)homeRegion;
-                        if (homeArray.Count == 2)
-                            HomeRegion = Utils.UIntsToLong((uint)homeArray[0].AsInteger(),
-                                                           (uint)homeArray[1].AsInteger());
-                        else
-                            HomeRegion = 0;
+                        HomePosition = ParseVector3("position", map);
+                        HomeLookAt = ParseVector3("look_at", map);
+
+                        var coords = (OSDArray)OSDParser.DeserializeLLSDNotation(map["region_handle"].ToString());
+                        if (coords.Type == OSDType.Array)
+                        {
+                            HomeRegion = (coords.Count == 2)
+                                ? Utils.UIntsToLong((uint)coords[0].AsInteger(), (uint)coords[1].AsInteger()) : 0;
+                        }
                     }
+                    else if (reply?["home"] is string osdString)
+                    {
+                        var osdMap = (OSDMap)OSDParser.DeserializeLLSDNotation(osdString);
+                        OSD homeRegion;
+                        if (osdMap.TryGetValue("region_handle", out homeRegion) && homeRegion.Type == OSDType.Array)
+                        {
+                            var homeArray = (OSDArray)homeRegion;
+                            HomeRegion = (homeArray.Count == 2)
+                                ? Utils.UIntsToLong((uint)homeArray[0].AsInteger(), (uint)homeArray[1].AsInteger()) : 0;
+                        }
 
-                    HomePosition = ParseVector3("position", home);
-                    HomeLookAt = ParseVector3("look_at", home);
+                        HomePosition = ParseVector3("position", osdMap);
+                        HomeLookAt = ParseVector3("look_at", osdMap);
+                    }
+                    else
+                    {
+                        throw new Exception("Could not parse 'home' in Login Response");
+                    }
+                } 
+                catch (Exception ex)
+                {
+                    Logger.Log("Could not parse 'home' field in login response. Setting nil.", Helpers.LogLevel.Warning, ex);
+                    HomeRegion = 0;
+                    HomePosition = Vector3.Zero;
+                    HomeLookAt = Vector3.Zero;
                 }
             }
             else
@@ -1767,4 +1786,4 @@ public LoginProgressEventArgs(LoginStatus login, string message, string failReas
     }
 
     #endregion EventArgs
-}
+}