OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This reverts commit f4b90b52db.
0.7-release
Justin Clark-Casey (justincc) 2010-06-29 23:44:37 +01:00
parent bfff39c4c0
commit 150ccac747
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -218,7 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (IScriptModule e in engines) foreach (IScriptModule e in engines)
{ {
if (e != null) if (e != null)
{ {
ArrayList errors = e.GetScriptErrors(itemID); ArrayList errors = e.GetScriptErrors(itemID);
foreach (Object line in errors) foreach (Object line in errors)
ret.Add(line); ret.Add(line);
@ -356,26 +356,14 @@ namespace OpenSim.Region.Framework.Scenes
m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml; m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml;
} }
foreach (IScriptModule e in engines) foreach (IScriptModule e in engines)
{ {
if (e != null) if (e != null)
{ {
// Stop an exception in setting saved state from propogating since this is not fatal. if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
try break;
{
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); m_part.ParentGroup.m_savedScriptState.Remove(oldID);
} }
} }
@ -1033,23 +1021,12 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (e != null) if (e != null)
{ {
// Stop any exception from the script engine from propogating since setting state string n = e.GetXMLState(item.ItemID);
// isn't essential. if (n != String.Empty)
try
{ {
string n = e.GetXMLState(item.ItemID); if (!ret.ContainsKey(item.ItemID))
if (n != String.Empty) ret[item.ItemID] = n;
{ break;
if (!ret.ContainsKey(item.ItemID))
ret[item.ItemID] = n;
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);
} }
} }
} }