diff options
Fix a possible NRE
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 13 |
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 | |||
2341 | 2341 | ||
2342 | if (appearanceSerialized != null) | 2342 | if (appearanceSerialized != null) |
2343 | { | 2343 | { |
2344 | OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); | 2344 | try |
2345 | appearance = new AvatarAppearance(); | 2345 | { |
2346 | appearance.Unpack(appearanceOsd); | 2346 | OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); |
2347 | appearance = new AvatarAppearance(); | ||
2348 | appearance.Unpack(appearanceOsd); | ||
2349 | } | ||
2350 | catch | ||
2351 | { | ||
2352 | return UUID.Zero.ToString(); | ||
2353 | } | ||
2347 | } | 2354 | } |
2348 | } | 2355 | } |
2349 | 2356 | ||