diff options
author | Melanie | 2012-06-06 14:16:19 +0100 |
---|---|---|
committer | Melanie | 2012-06-06 14:16:19 +0100 |
commit | c0b21d92c2219c3bfd69e1467c28f20859dd4dc7 (patch) | |
tree | edb346e1bcde87b1029babc753df9279e4102239 /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' into careminster (diff) | |
parent | fix the real cause of double velocity (diff) | |
download | opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 9595d48..5905958 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3056,8 +3056,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3056 | 3056 | ||
3057 | if (pa != null && pa.IsPhysical && llvel != Vector3.Zero) | 3057 | if (pa != null && pa.IsPhysical && llvel != Vector3.Zero) |
3058 | { | 3058 | { |
3059 | //Recoil. | 3059 | // recoil |
3060 | llApplyImpulse(new LSL_Vector(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0); | 3060 | llvel *= -groupmass; |
3061 | llApplyImpulse(new LSL_Vector(llvel.X, llvel.Y,llvel.Z), 0); | ||
3061 | } | 3062 | } |
3062 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) | 3063 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) |
3063 | return; | 3064 | return; |
@@ -3249,7 +3250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3249 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 3250 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
3250 | 3251 | ||
3251 | if (attachmentsModule != null) | 3252 | if (attachmentsModule != null) |
3252 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false); | 3253 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true); |
3253 | else | 3254 | else |
3254 | return false; | 3255 | return false; |
3255 | } | 3256 | } |