diff options
| author | Kitto Flora | 2010-07-13 20:37:45 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-07-13 20:37:45 +0000 |
| commit | 84227fd55852391dae6f2e162c4b0a852ee24f13 (patch) | |
| tree | f3472e0268397366fdf6096bf4e925f9002d24dd /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes oc... (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.zip opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.gz opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.bz2 opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.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/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c5fb198..d323e19 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4818,7 +4818,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4818 | part.NextOwnerMask; | 4818 | part.NextOwnerMask; |
| 4819 | item.GroupPermissions = part.GroupMask & | 4819 | item.GroupPermissions = part.GroupMask & |
| 4820 | part.NextOwnerMask; | 4820 | part.NextOwnerMask; |
| 4821 | item.CurrentPermissions |= 8; // Slam! | 4821 | item.CurrentPermissions |= 16; // Slam! |
| 4822 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 4822 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
| 4823 | 4823 | ||
| 4824 | if (InventoryService.AddItem(item)) | 4824 | if (InventoryService.AddItem(item)) |