diff options
| author | dahlia | 2015-02-24 17:16:30 -0800 |
|---|---|---|
| committer | dahlia | 2015-02-24 17:16:30 -0800 |
| commit | 8333dcf388150902e34537275bdfd0bcb902913e (patch) | |
| tree | 9cf570e26d0e90a823968337ada8e212b1430187 /OpenSim/Region | |
| parent | BulletSim: update the OSX BulletSim binary to the latest sources in (diff) | |
| download | opensim-SC_OLD-8333dcf388150902e34537275bdfd0bcb902913e.zip opensim-SC_OLD-8333dcf388150902e34537275bdfd0bcb902913e.tar.gz opensim-SC_OLD-8333dcf388150902e34537275bdfd0bcb902913e.tar.bz2 opensim-SC_OLD-8333dcf388150902e34537275bdfd0bcb902913e.tar.xz | |
llLookAt(): use non-physical rotation if host prim is a physical attachment
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 4825556..ebdd9da 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3108,7 +3108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3108 | // set the rotation of the object, copy that behavior | 3108 | // set the rotation of the object, copy that behavior |
| 3109 | PhysicsActor pa = m_host.PhysActor; | 3109 | PhysicsActor pa = m_host.PhysActor; |
| 3110 | 3110 | ||
| 3111 | if (strength == 0 || pa == null || !pa.IsPhysical) | 3111 | if (m_host.ParentGroup.IsAttachment || strength == 0 || pa == null || !pa.IsPhysical) |
| 3112 | { | 3112 | { |
| 3113 | llSetRot(rot); | 3113 | llSetRot(rot); |
| 3114 | } | 3114 | } |