From b51a0e996080dc1f79537ca729351f1f7375ab98 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 19 Feb 2009 01:14:26 +0000 Subject: [PATCH] Fix region crossing for unscripted prims, avoid costly SEH --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index b6cc73ad43..7d36a63af0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs @@ -437,13 +437,15 @@ namespace OpenSim.Region.Framework.Scenes public void SetState(string objXMLData, UUID RegionID) { + if (objXMLData == String.Empty) + return; XmlDocument doc = new XmlDocument(); try { doc.LoadXml(objXMLData); } - catch (System.Xml.XmlException) + catch (Exception) // (System.Xml.XmlException) { // We will get here if the XML is invalid or in unit // tests. Really should determine which it is and either