aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2009-02-19 01:14:26 +0000
committerMelanie Thielker2009-02-19 01:14:26 +0000
commitb51a0e996080dc1f79537ca729351f1f7375ab98 (patch)
tree40242ee5b5ba18ff98abf6173cc725c46b68494e /OpenSim/Region/Framework
parentMake in-code provisions for the tests. Tests would fail because the (diff)
downloadopensim-SC_OLD-b51a0e996080dc1f79537ca729351f1f7375ab98.zip
opensim-SC_OLD-b51a0e996080dc1f79537ca729351f1f7375ab98.tar.gz
opensim-SC_OLD-b51a0e996080dc1f79537ca729351f1f7375ab98.tar.bz2
opensim-SC_OLD-b51a0e996080dc1f79537ca729351f1f7375ab98.tar.xz
Fix region crossing for unscripted prims, avoid costly SEH
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index b6cc73a..7d36a63 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
437 437
438 public void SetState(string objXMLData, UUID RegionID) 438 public void SetState(string objXMLData, UUID RegionID)
439 { 439 {
440 if (objXMLData == String.Empty)
441 return;
440 442
441 XmlDocument doc = new XmlDocument(); 443 XmlDocument doc = new XmlDocument();
442 try 444 try
443 { 445 {
444 doc.LoadXml(objXMLData); 446 doc.LoadXml(objXMLData);
445 } 447 }
446 catch (System.Xml.XmlException) 448 catch (Exception) // (System.Xml.XmlException)
447 { 449 {
448 // We will get here if the XML is invalid or in unit 450 // We will get here if the XML is invalid or in unit
449 // tests. Really should determine which it is and either 451 // tests. Really should determine which it is and either