aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-06-15 15:18:57 +0200
committerMelanie2012-06-15 15:18:57 +0200
commitffc0badaf439139180bca9ed8f478ddabe7c7608 (patch)
tree7d90877cdffb34a32b9ac372522693bd52c1af18 /OpenSim
parentRevert changes... (diff)
downloadopensim-SC-ffc0badaf439139180bca9ed8f478ddabe7c7608.zip
opensim-SC-ffc0badaf439139180bca9ed8f478ddabe7c7608.tar.gz
opensim-SC-ffc0badaf439139180bca9ed8f478ddabe7c7608.tar.bz2
opensim-SC-ffc0badaf439139180bca9ed8f478ddabe7c7608.tar.xz
Reapply the one change that was in the revert that was actually function, not
form
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
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 959d928..fe85118 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2370,7 +2370,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2370 // scene 2370 // scene
2371 PhysicsActor pa = part.PhysActor; 2371 PhysicsActor pa = part.PhysActor;
2372 2372
2373 if (pa != null && !pa.IsPhysical) 2373 if (pa != null && !pa.IsPhysical && part == part.ParentGroup.RootPart)
2374 { 2374 {
2375 part.ParentGroup.ResetChildPrimPhysicsPositions(); 2375 part.ParentGroup.ResetChildPrimPhysicsPositions();
2376 } 2376 }