diff options
| author | Melanie | 2012-09-29 21:47:08 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-29 21:47:08 +0100 |
| commit | 944b1ed2378d2eb6a89b6d5a1738aa63d30b0ae0 (patch) | |
| tree | 9611b426811011929b05f4cc41f2f30808b872b5 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| download | opensim-SC-944b1ed2378d2eb6a89b6d5a1738aa63d30b0ae0.zip opensim-SC-944b1ed2378d2eb6a89b6d5a1738aa63d30b0ae0.tar.gz opensim-SC-944b1ed2378d2eb6a89b6d5a1738aa63d30b0ae0.tar.bz2 opensim-SC-944b1ed2378d2eb6a89b6d5a1738aa63d30b0ae0.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -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 160e2df..8ad1451 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2362,9 +2362,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2362 | 2362 | ||
| 2363 | if (appearanceSerialized != null) | 2363 | if (appearanceSerialized != null) |
| 2364 | { | 2364 | { |
| 2365 | OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); | 2365 | try |
| 2366 | appearance = new AvatarAppearance(); | 2366 | { |
| 2367 | appearance.Unpack(appearanceOsd); | 2367 | OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); |
| 2368 | appearance = new AvatarAppearance(); | ||
| 2369 | appearance.Unpack(appearanceOsd); | ||
| 2370 | } | ||
| 2371 | catch | ||
| 2372 | { | ||
| 2373 | return UUID.Zero.ToString(); | ||
| 2374 | } | ||
| 2368 | } | 2375 | } |
| 2369 | } | 2376 | } |
| 2370 | 2377 | ||