Fix a possible NRE

2012-09-28 00:15:14 +02:00 · 2012-09-28 00:15:14 +02:00 · 7e21ddeeff
parent a0065ad616
commit 7e21ddeeff
1 changed files with 10 additions and 3 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@ -2340,11 +2340,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    string appearanceSerialized = LoadNotecard(notecard);

                    if (appearanceSerialized != null)
+                    {
+                        try
                        {
                            OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
                            appearance = new AvatarAppearance();
                            appearance.Unpack(appearanceOsd);
                        }
+                        catch
+                        {
+                            return UUID.Zero.ToString();
+                        }
+                    }
                }

                if (appearance == null)