diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 0f274f3..e5e8a56 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1373,7 +1373,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1373 | { | 1373 | { |
| 1374 | sdoc.LoadXml(xml); | 1374 | sdoc.LoadXml(xml); |
| 1375 | } | 1375 | } |
| 1376 | catch (System.Xml.XmlException e) | 1376 | catch (System.Xml.XmlException) |
| 1377 | { | 1377 | { |
| 1378 | loadedState = false; | 1378 | loadedState = false; |
| 1379 | } | 1379 | } |