diff options
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 '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ab087af..cf6f13e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2985,7 +2985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2985 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 2985 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
2986 | 2986 | ||
2987 | if (attachmentsModule != null) | 2987 | if (attachmentsModule != null) |
2988 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, false); | 2988 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, true); |
2989 | else | 2989 | else |
2990 | return false; | 2990 | return false; |
2991 | } | 2991 | } |
@@ -11787,4 +11787,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11787 | } | 11787 | } |
11788 | } | 11788 | } |
11789 | } | 11789 | } |
11790 | } \ No newline at end of file | 11790 | } |