Glob on previous handling for Login response home field. I thought LL…

… had realized their mistake on breaking API. My bad.
cinderblocks · Dec 7, 2021 · a680277 · a680277
1 parent bd3705f
commit a680277
Showing 1 changed file with 34 additions and 15 deletions.
diff --git a/LibreMetaverse/Login.cs b/LibreMetaverse/Login.cs
@@ -495,22 +495,41 @@ public void Parse(Hashtable reply)
                 // Home
                 if (Home.RegionHandle == 0 && reply.ContainsKey("home"))
                 {
-                    var osdHome = OSDParser.DeserializeLLSDNotation(reply["home"].ToString());
-
-                    if (osdHome.Type == OSDType.Map)
-                    {
-                        var home = (OSDMap)osdHome;
-
-                        OSD homeRegion;
-                        if (home.TryGetValue("region_handle", out homeRegion) && homeRegion.Type == OSDType.Array)
-                        {
-                            var coords = (OSDArray)homeRegion;
-                            Home.RegionHandle = (coords.Count == 2)
-                                ? Utils.UIntsToLong((uint)coords[0].AsInteger(), (uint)coords[1].AsInteger()) : 0;
-
+                    if (reply?["home"] is Hashtable map)
+                    {
+                        Home.Position = ParseVector3("position", map);
+                        Home.LookAt = ParseVector3("look_at", map);
+
+                        var coords = (OSDArray)OSDParser.DeserializeLLSDNotation(map["region_handle"].ToString());
+                        if (coords.Type == OSDType.Array)
+                        {
+                            Home.RegionHandle = (coords.Count == 2)
+                                ? Utils.UIntsToLong((uint)coords[0].AsInteger(), (uint)coords[1].AsInteger()) : 0;
+                        }
+                    }
+                    else if (reply?["home"] is string osdString)
+                    {
+                        var osdHome = OSDParser.DeserializeLLSDNotation(reply["home"].ToString());
+
+                        if (osdHome.Type == OSDType.Map)
+                        {
+                            var home = (OSDMap)osdHome;
+
+                            OSD homeRegion;
+                            if (home.TryGetValue("region_handle", out homeRegion) && homeRegion.Type == OSDType.Array)
+                            {
+                                var coords = (OSDArray)homeRegion;
+                                Home.RegionHandle = (coords.Count == 2)
+                                    ? Utils.UIntsToLong((uint)coords[0].AsInteger(), (uint)coords[1].AsInteger()) : 0;
+
+                            }
+                            Home.Position = ParseVector3("position", home);
+                            Home.LookAt = ParseVector3("look_at", home);
                         }
-                        Home.Position = ParseVector3("position", home);
-                        Home.LookAt = ParseVector3("look_at", home);
+                    }
+                    else
+                    {
+                        throw new Exception("Could not parse 'home' in Login Response");
                     }
                 }
             } catch (Exception ex)