Fix a possible NRE

1 files changed, 10 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2f02f1f..80111f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2341,9 +2341,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     if (appearanceSerialized != null)
                     {
-                        OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
-                        appearance = new AvatarAppearance();
-                        appearance.Unpack(appearanceOsd);
+                        try
+                        {
+                            OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+                            appearance = new AvatarAppearance();
+                            appearance.Unpack(appearanceOsd);
+                        }
+                        catch
+                        {
+                            return UUID.Zero.ToString();
+                        }
                     }
                 }