diff options
| author | Melanie | 2013-03-18 22:56:03 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-18 22:56:03 +0000 |
| commit | fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1 (patch) | |
| tree | d942d65d0687ac8d30ec41a7c3a6188ddc2d370e /OpenSim/Region/OptionalModules | |
| parent | * Add a Max Payload size property to the Websocket Server Handler. If you ... (diff) | |
| download | opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.zip opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.tar.gz opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.tar.bz2 opensim-SC_OLD-fcecfc81bbd6ee8ebfa2dc0585d92ebf899358c1.tar.xz | |
Multiattach, part 1
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -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 1e7bc02..e9ddbbe 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) ? 1 : 0; | 186 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true) ? 1 : 0; |
| 187 | } | 187 | } |
| 188 | } | 188 | } |
| 189 | } | 189 | } |