diff options
| author | Melanie | 2010-09-19 22:53:05 +0200 |
|---|---|---|
| committer | Melanie | 2010-09-19 22:53:05 +0200 |
| commit | 9cf8795ecf1a2f34f803babf318d9c1f394ee18b (patch) | |
| tree | 07777eb9eef06e8a1556fa4283f8e54f5df9ba2c /OpenSim/Region/Framework/Scenes | |
| parent | Overwrite the core version of the string parsing method with ours (diff) | |
| download | opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.zip opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.tar.gz opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.tar.bz2 opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.tar.xz | |
Fix a merge artefact that broke script state persistence in XAttachments
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index f9bfffd..41b0a42 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1029,7 +1029,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1029 | SceneObjectPart[] parts = m_parts.GetArray(); | 1029 | SceneObjectPart[] parts = m_parts.GetArray(); |
| 1030 | for (int i = 0; i < parts.Length; i++) | 1030 | for (int i = 0; i < parts.Length; i++) |
| 1031 | { | 1031 | { |
| 1032 | Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); | 1032 | Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs); |
| 1033 | foreach (KeyValuePair<UUID, string> kvp in pstates) | 1033 | foreach (KeyValuePair<UUID, string> kvp in pstates) |
| 1034 | states.Add(kvp.Key, kvp.Value); | 1034 | states.Add(kvp.Key, kvp.Value); |
| 1035 | } | 1035 | } |