diff options
author | Melanie | 2013-07-04 22:32:58 +0100 |
---|---|---|
committer | Melanie | 2013-07-04 22:32:58 +0100 |
commit | 5ddcc25ee9de481c40a26aabc57d77c71225162e (patch) | |
tree | 298768abaca492365ac1c9786b0d4ce7dae934ab /OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Guard against completely unknown user UUIDs. (diff) | |
download | opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.zip opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.gz opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.bz2 opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index 235da78..87eed98 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |||
@@ -41,12 +41,15 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
41 | // The index of this child prim. | 41 | // The index of this child prim. |
42 | public int LinksetChildIndex { get; set; } | 42 | public int LinksetChildIndex { get; set; } |
43 | 43 | ||
44 | public BSLinksetInfo LinksetInfo { get; set; } | 44 | public BSLinkset.LinksetImplementation LinksetType { get; set; } |
45 | 45 | ||
46 | public BSPrimLinkable(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size, | 46 | public BSPrimLinkable(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size, |
47 | OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical) | 47 | OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical) |
48 | : base(localID, primName, parent_scene, pos, size, rotation, pbs, pisPhysical) | 48 | : base(localID, primName, parent_scene, pos, size, rotation, pbs, pisPhysical) |
49 | { | 49 | { |
50 | // Default linkset implementation for this prim | ||
51 | LinksetType = (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation; | ||
52 | |||
50 | Linkset = BSLinkset.Factory(PhysScene, this); | 53 | Linkset = BSLinkset.Factory(PhysScene, this); |
51 | 54 | ||
52 | PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate() | 55 | PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate() |