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/ScriptEngine/Shared | |
| 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/ScriptEngine/Shared')
| -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 | } |