diff options
| author | Melanie | 2011-01-11 14:38:10 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-11 14:38:10 +0000 |
| commit | d7fd4b2153df8fb59596ab419b730e153b7c8ae7 (patch) | |
| tree | 69dab4134a498fd683397a993d556901b7f2677b /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Replace the new, tricky MySql.Data.dll with the older version from 0.6.9 (diff) | |
| parent | Partial permissions fix for boxed items. (diff) | |
| download | opensim-SC-d7fd4b2153df8fb59596ab419b730e153b7c8ae7.zip opensim-SC-d7fd4b2153df8fb59596ab419b730e153b7c8ae7.tar.gz opensim-SC-d7fd4b2153df8fb59596ab419b730e153b7c8ae7.tar.bz2 opensim-SC-d7fd4b2153df8fb59596ab419b730e153b7c8ae7.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/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 304de67..6e0fc43 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -2857,8 +2857,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2857 | } | 2857 | } |
| 2858 | } | 2858 | } |
| 2859 | 2859 | ||
| 2860 | RootPart.UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect); | ||
| 2860 | for (int i = 0; i < parts.Length; i++) | 2861 | for (int i = 0; i < parts.Length; i++) |
| 2861 | parts[i].UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect); | 2862 | { |
| 2863 | if (parts[i] != RootPart) | ||
| 2864 | parts[i].UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect); | ||
| 2865 | } | ||
| 2862 | } | 2866 | } |
| 2863 | } | 2867 | } |
| 2864 | 2868 | ||