diff options
| author | Melanie | 2010-03-18 20:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 20:09:04 +0000 |
| commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
| tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d083119..3895d93 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1370,8 +1370,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1370 | { | 1370 | { |
| 1371 | // part.Inventory.RemoveScriptInstances(); | 1371 | // part.Inventory.RemoveScriptInstances(); |
| 1372 | 1372 | ||
| 1373 | ScenePresence[] avatars = Scene.GetScenePresences(); | 1373 | List<ScenePresence> avatars = Scene.GetScenePresences(); |
| 1374 | for (int i = 0; i < avatars.Length; i++) | 1374 | for (int i = 0; i < avatars.Count; i++) |
| 1375 | { | 1375 | { |
| 1376 | if (avatars[i].ParentID == LocalId) | 1376 | if (avatars[i].ParentID == LocalId) |
| 1377 | { | 1377 | { |