diff options
| author | Melanie | 2010-09-21 04:03:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-21 04:03:40 +0100 |
| commit | 41847e8fdf32994b5bd61699b490b90eb57a19a0 (patch) | |
| tree | b14071e3324476c7b736b2d07f47ecfa520d8ee5 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Fix a typo (diff) | |
| download | opensim-SC-41847e8fdf32994b5bd61699b490b90eb57a19a0.zip opensim-SC-41847e8fdf32994b5bd61699b490b90eb57a19a0.tar.gz opensim-SC-41847e8fdf32994b5bd61699b490b90eb57a19a0.tar.bz2 opensim-SC-41847e8fdf32994b5bd61699b490b90eb57a19a0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 62245d4..c94a873 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1033,7 +1033,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1033 | SceneObjectPart[] parts = m_parts.GetArray(); | 1033 | SceneObjectPart[] parts = m_parts.GetArray(); |
| 1034 | for (int i = 0; i < parts.Length; i++) | 1034 | for (int i = 0; i < parts.Length; i++) |
| 1035 | { | 1035 | { |
| 1036 | Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); | 1036 | Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs); |
| 1037 | foreach (KeyValuePair<UUID, string> kvp in pstates) | 1037 | foreach (KeyValuePair<UUID, string> kvp in pstates) |
| 1038 | states.Add(kvp.Key, kvp.Value); | 1038 | states.Add(kvp.Key, kvp.Value); |
| 1039 | } | 1039 | } |