diff options
| author | UbitUmarov | 2013-06-08 19:19:51 +0100 |
|---|---|---|
| committer | UbitUmarov | 2013-06-08 19:19:51 +0100 |
| commit | 925a8d47eb18b98e97da9c9e34456914ab0c8d78 (patch) | |
| tree | 7661cd0fb33c61457a9a8158e664580ca65e6a3f /OpenSim/Region | |
| parent | add indexes for new visual parameters shape_hover and (diff) | |
| parent | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff) | |
| download | opensim-SC-925a8d47eb18b98e97da9c9e34456914ab0c8d78.zip opensim-SC-925a8d47eb18b98e97da9c9e34456914ab0c8d78.tar.gz opensim-SC-925a8d47eb18b98e97da9c9e34456914ab0c8d78.tar.bz2 opensim-SC-925a8d47eb18b98e97da9c9e34456914ab0c8d78.tar.xz | |
Merge branch 'avination-current' into ubitwork
Diffstat (limited to 'OpenSim/Region')
| -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( |