From e69057a1b6115d6d7012d09eccee3ba8aca16d41 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 23 May 2017 04:21:03 +0100
Subject:  dont fail saving a OAR because of a broken material

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 93406cb..5a9a5a0 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -550,7 +550,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private void RecordMaterialAssetUuids(AssetBase materialAsset)
         {
-            OSDMap mat = (OSDMap)OSDParser.DeserializeLLSDXml(materialAsset.Data);
+            OSDMap mat;
+            try
+            {
+                mat = (OSDMap)OSDParser.DeserializeLLSDXml(materialAsset.Data);
+            }
+            catch (Exception e)
+            {
+               m_log.WarnFormat("[Materials]: cannot decode material asset {0}: {1}", materialAsset.ID, e.Message);
+               return;
+            }
 
             UUID normMap = mat["NormMap"].AsUUID();
             if (normMap != UUID.Zero)
-- 
cgit v1.1