diff options
| author | Melanie | 2012-09-28 00:15:14 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-28 00:15:14 +0200 |
| commit | 7e21ddeeff8cbe7a715c0b2e4fc6bbd47e1160d8 (patch) | |
| tree | 4c10b98d761c1a97bc4ad554c31e701fb0e5bcb6 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | create a new PollServiceHttpRequest req per loop since they can be sent to (diff) | |
| download | opensim-SC-7e21ddeeff8cbe7a715c0b2e4fc6bbd47e1160d8.zip opensim-SC-7e21ddeeff8cbe7a715c0b2e4fc6bbd47e1160d8.tar.gz opensim-SC-7e21ddeeff8cbe7a715c0b2e4fc6bbd47e1160d8.tar.bz2 opensim-SC-7e21ddeeff8cbe7a715c0b2e4fc6bbd47e1160d8.tar.xz | |
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 | ||