diff options
author | Justin Clark-Casey (justincc) | 2012-08-17 18:48:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-17 18:48:35 +0100 |
commit | 99e339dd40181d0b396db389366887a017870021 (patch) | |
tree | 2a7d3e9f314fb452022dd445d0773a0025da3dcc /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
parent | adding a clip method to handle Vector3 objects to enable a minor amount of re... (diff) | |
parent | Correct an exception report in SceneObjectPart so it outputs the stack. (diff) | |
download | opensim-SC_OLD-99e339dd40181d0b396db389366887a017870021.zip opensim-SC_OLD-99e339dd40181d0b396db389366887a017870021.tar.gz opensim-SC_OLD-99e339dd40181d0b396db389366887a017870021.tar.bz2 opensim-SC_OLD-99e339dd40181d0b396db389366887a017870021.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 087b9bb..1b3ba3f 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -42,6 +42,9 @@ public class BSLinkset | |||
42 | private BSScene m_physicsScene; | 42 | private BSScene m_physicsScene; |
43 | public BSScene PhysicsScene { get { return m_physicsScene; } } | 43 | public BSScene PhysicsScene { get { return m_physicsScene; } } |
44 | 44 | ||
45 | static int m_nextLinksetID = 1; | ||
46 | public int LinksetID { get; private set; } | ||
47 | |||
45 | // The children under the root in this linkset | 48 | // The children under the root in this linkset |
46 | private List<BSPrim> m_children; | 49 | private List<BSPrim> m_children; |
47 | 50 | ||
@@ -74,6 +77,10 @@ public class BSLinkset | |||
74 | public BSLinkset(BSScene scene, BSPrim parent) | 77 | public BSLinkset(BSScene scene, BSPrim parent) |
75 | { | 78 | { |
76 | // A simple linkset of one (no children) | 79 | // A simple linkset of one (no children) |
80 | LinksetID = m_nextLinksetID++; | ||
81 | // We create LOTS of linksets. | ||
82 | if (m_nextLinksetID < 0) | ||
83 | m_nextLinksetID = 1; | ||
77 | m_physicsScene = scene; | 84 | m_physicsScene = scene; |
78 | m_linksetRoot = parent; | 85 | m_linksetRoot = parent; |
79 | m_children = new List<BSPrim>(); | 86 | m_children = new List<BSPrim>(); |