diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:25:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:25:12 -0400 |
commit | b2ade764a91ad1b7edcf6e21af76430f670f54fb (patch) | |
tree | c022033f90401e6d2bf77c365540b26aa1b3eaa9 /indra/newview/lldriverparam.h | |
parent | 8d408673e1769dbe435065c4fcf29995c3ce2f3c (diff) | |
parent | c5abb4b116d0b31a74059dcb4b338654ca7bedfe (diff) |
merge latest avatar-physics updates
Diffstat (limited to 'indra/newview/lldriverparam.h')
-rw-r--r-- | indra/newview/lldriverparam.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h index a0e45cf5e5..fb1b44458c 100644 --- a/indra/newview/lldriverparam.h +++ b/indra/newview/lldriverparam.h @@ -30,6 +30,7 @@ #include "llviewervisualparam.h" #include "llwearabletype.h" +class LLPhysicsMotion; class LLVOAvatar; class LLWearable; @@ -76,6 +77,7 @@ protected: class LLDriverParam : public LLViewerVisualParam { + friend class LLPhysicsMotion; // physics motion needs to access driven params directly. public: LLDriverParam(LLVOAvatar *avatarp); LLDriverParam(LLWearable *wearablep); |