diff options
| author | Kitto Flora | 2011-01-13 04:48:32 +0000 |
|---|---|---|
| committer | Kitto Flora | 2011-01-13 04:48:32 +0000 |
| commit | c0134710f7f2c2ee51f51166f0987d3d6d589204 (patch) | |
| tree | 77c933047a09377ec1647ed78f45cbbb29b9f246 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
| parent | Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-c0134710f7f2c2ee51f51166f0987d3d6d589204.zip opensim-SC-c0134710f7f2c2ee51f51166f0987d3d6d589204.tar.gz opensim-SC-c0134710f7f2c2ee51f51166f0987d3d6d589204.tar.bz2 opensim-SC-c0134710f7f2c2ee51f51166f0987d3d6d589204.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/SceneObjectGroup.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index 50521c4..0b545c4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -118,7 +118,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 118 | taskItem.NextPermissions = item.NextPermissions; | 118 | taskItem.NextPermissions = item.NextPermissions; |
| 119 | // We're adding this to a prim we don't own. Force | 119 | // We're adding this to a prim we don't own. Force |
| 120 | // owner change | 120 | // owner change |
| 121 | taskItem.CurrentPermissions |= 16; // Slam | 121 | taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; |
| 122 | } | 122 | } |
| 123 | else | 123 | else |
| 124 | { | 124 | { |