diff options
| author | Melanie | 2013-03-06 00:15:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-06 00:15:54 +0000 |
| commit | 339d8ef2a657dd08bc6328da6e285b8550d05a74 (patch) | |
| tree | 612080502d4da19051a2fcc8dfb7ff26a90fbfa7 /OpenSim/Region/OptionalModules/Avatar/Attachments | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Limit each attachment point to 5 items as per spec (diff) | |
| download | opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.zip opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.gz opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.bz2 opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Attachments')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs index e9ddbbe..bed192a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||
| @@ -183,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
| 183 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); | 183 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true) ? 1 : 0; | 186 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true, true) ? 1 : 0; |
| 187 | } | 187 | } |
| 188 | } | 188 | } |
| 189 | } | 189 | } |