diff options
| author | Kitto Flora | 2011-01-20 06:52:10 +0000 |
|---|---|---|
| committer | Kitto Flora | 2011-01-20 06:52:10 +0000 |
| commit | b92673c1c97b2c0f5d76be7d5093b7611483c5a0 (patch) | |
| tree | 71632ad1bb4d79fb401316b723b6439682ea6f45 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Fix drift of static prim. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-b92673c1c97b2c0f5d76be7d5093b7611483c5a0.zip opensim-SC-b92673c1c97b2c0f5d76be7d5093b7611483c5a0.tar.gz opensim-SC-b92673c1c97b2c0f5d76be7d5093b7611483c5a0.tar.bz2 opensim-SC-b92673c1c97b2c0f5d76be7d5093b7611483c5a0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 8761284..2ee8c07 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -881,7 +881,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 881 | { | 881 | { |
| 882 | item.ParentID = m_part.UUID; | 882 | item.ParentID = m_part.UUID; |
| 883 | item.ParentPartID = m_part.UUID; | 883 | item.ParentPartID = m_part.UUID; |
| 884 | item.Flags = m_items[item.ItemID].Flags; | ||
| 885 | 884 | ||
| 886 | // If group permissions have been set on, check that the groupID is up to date in case it has | 885 | // If group permissions have been set on, check that the groupID is up to date in case it has |
| 887 | // changed since permissions were last set. | 886 | // changed since permissions were last set. |