diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
commit | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (patch) | |
tree | 9f01f2c772212fcad555176a272265b5b4d67b09 /indra/newview/lldriverparam.h | |
parent | dff83a1ba0592049ccdcd31177c183d62df65e85 (diff) | |
parent | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (diff) |
merge changes for storm-1117
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); |