diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:15:17 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:15:17 -0700 |
| commit | 886fe3eefc8688df206e7b397a6b9438c7492f5f (patch) | |
| tree | 1851859f1fb2498bcd89a080d53620e77b9dc68f /indra/llcharacter/lljoint.h | |
| parent | 7a64e8f8bfeff17d6a5385a6c39f1056214cb59f (diff) | |
| parent | 2207dc0e610c1bf18f04620bc216e0da71762237 (diff) | |
Merge
Diffstat (limited to 'indra/llcharacter/lljoint.h')
| -rw-r--r-- | indra/llcharacter/lljoint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 8112d246f2..aa997a4cf7 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -139,8 +139,8 @@ public: S32 mJointNum; // child joints - typedef std::list<LLJoint*> child_list_t; - child_list_t mChildren; + typedef std::vector<LLJoint*> joints_t; + joints_t mChildren; // debug statics static S32 sNumTouches; |