diff options
| author | UbitUmarov | 2013-06-08 19:18:47 +0100 |
|---|---|---|
| committer | UbitUmarov | 2013-06-08 19:18:47 +0100 |
| commit | 244f6fa5cda1f4eb85617d02b2650dacacdc6a8a (patch) | |
| tree | 5bd92bc0c6b15c2762d28e1e9381f924ad989720 /OpenSim/Region | |
| parent | keyframe: add more locks, change timming stop, added Suspend and resume (diff) | |
| parent | Make objects attached from the ground appear in inventory again. Fixes a number (diff) | |
| download | opensim-SC-244f6fa5cda1f4eb85617d02b2650dacacdc6a8a.zip opensim-SC-244f6fa5cda1f4eb85617d02b2650dacacdc6a8a.tar.gz opensim-SC-244f6fa5cda1f4eb85617d02b2650dacacdc6a8a.tar.bz2 opensim-SC-244f6fa5cda1f4eb85617d02b2650dacacdc6a8a.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index cb724aa..f2f789b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -1147,7 +1147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 1147 | AttachmentPt &= 0x7f; | 1147 | AttachmentPt &= 0x7f; |
| 1148 | 1148 | ||
| 1149 | // Calls attach with a Zero position | 1149 | // Calls attach with a Zero position |
| 1150 | if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, false, append)) | 1150 | if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, true, append)) |
| 1151 | { | 1151 | { |
| 1152 | if (DebugLevel > 0) | 1152 | if (DebugLevel > 0) |
| 1153 | m_log.Debug( | 1153 | m_log.Debug( |