diff options
| author | UbitUmarov | 2012-04-04 17:01:29 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-04-04 17:01:29 +0100 |
| commit | 867d50d14c1ad0ae1e885e163dfc4f2e9afc6749 (patch) | |
| tree | 7de9e9f7b8f1cce4dcaac11af4f62f72995c61c2 /OpenSim | |
| parent | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This funct... (diff) | |
| download | opensim-SC-867d50d14c1ad0ae1e885e163dfc4f2e9afc6749.zip opensim-SC-867d50d14c1ad0ae1e885e163dfc4f2e9afc6749.tar.gz opensim-SC-867d50d14c1ad0ae1e885e163dfc4f2e9afc6749.tar.bz2 opensim-SC-867d50d14c1ad0ae1e885e163dfc4f2e9afc6749.tar.xz | |
remove more merge artefacts
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f091a91..83021b0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2186,18 +2186,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2186 | 2186 | ||
| 2187 | if (ParentID != 0 && ParentID != LocalId) | 2187 | if (ParentID != 0 && ParentID != LocalId) |
| 2188 | { | 2188 | { |
| 2189 | ParentGroup.Scene.AddPhysicalPrim(1); | 2189 | PhysicsActor parentPa = ParentGroup.RootPart.PhysActor; |
| 2190 | 2190 | ||
| 2191 | pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; | 2191 | if (parentPa != null) |
| 2192 | pa.OnOutOfBounds += PhysicsOutOfBounds; | ||
| 2193 | if (ParentID != 0 && ParentID != LocalId) | ||
| 2194 | { | 2192 | { |
| 2195 | PhysicsActor parentPa = ParentGroup.RootPart.PhysActor; | 2193 | pa.link(parentPa); |
| 2196 | |||
| 2197 | if (parentPa != null) | ||
| 2198 | { | ||
| 2199 | pa.link(parentPa); | ||
| 2200 | } | ||
| 2201 | } | 2194 | } |
| 2202 | } | 2195 | } |
| 2203 | } | 2196 | } |