diff options
| author | UbitUmarov | 2018-01-05 22:37:42 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-05 22:37:42 +0000 |
| commit | 875ca104b85dbf48fc0e5035dc2c01b10a61f8e9 (patch) | |
| tree | 5a48cbd483b57c88d5be9c012e8f28422f3e368f /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | a few more xml things (diff) | |
| download | opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.zip opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.gz opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.bz2 opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index b22bda0..0b8cc7f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -455,7 +455,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 455 | if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) | 455 | if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) |
| 456 | { | 456 | { |
| 457 | XmlDocument doc = new XmlDocument(); | 457 | XmlDocument doc = new XmlDocument(); |
| 458 | 458 | doc.XmlResolver=null; | |
| 459 | doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); | 459 | doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); |
| 460 | 460 | ||
| 461 | ////////// CRUFT WARNING /////////////////////////////////// | 461 | ////////// CRUFT WARNING /////////////////////////////////// |