Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"

This reverts commit ae24548216.

Reverted for now pending a fix to the underlying xengine problem instead.
0.6.9-post-fixes
Justin Clark-Casey (justincc) 2010-06-29 22:50:04 +01:00
parent ae24548216
commit cabb70d90a
1 changed files with 8 additions and 31 deletions

View File

@ -359,26 +359,14 @@ namespace OpenSim.Region.Framework.Scenes
m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml;
}
foreach (IScriptModule e in engines)
{
if (e != null)
{
// Stop an exception in setting saved state from propogating since this is not fatal.
try
{
if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
break;
}
catch (Exception ex)
{
m_log.WarnFormat(
"[PRIM INVENTORY]: Could not set script state for old key {0}, new key {1} in prim {2} {3}. Exception {4}{5}",
oldID, newID, m_part.Name, m_part.UUID, ex.Message, ex.StackTrace);
}
}
}
m_part.ParentGroup.m_savedScriptState.Remove(oldID);
}
}
@ -1039,10 +1027,6 @@ namespace OpenSim.Region.Framework.Scenes
foreach (IScriptModule e in engines)
{
if (e != null)
{
// Stop any exception from the script engine from propogating since setting state
// isn't essential.
try
{
string n = e.GetXMLState(item.ItemID);
if (n != String.Empty)
@ -1052,13 +1036,6 @@ namespace OpenSim.Region.Framework.Scenes
break;
}
}
catch (Exception ex)
{
m_log.WarnFormat(
"[PRIM INVENTORY]: Could not retrieve script state for item {0} {1} in prim {2} {3}. Exception {4}{5}",
item.Name, item.ItemID, m_part.Name, m_part.UUID, ex.Message, ex.StackTrace);
}
}
}
}
}