diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
| commit | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (patch) | |
| tree | 4d942a13d1fd358a8a10a67554ea9a85b7f04c6f /indra/llcharacter/llvisualparam.h | |
| parent | 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 (diff) | |
| parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) | |
merge with remote repo
Diffstat (limited to 'indra/llcharacter/llvisualparam.h')
| -rw-r--r-- | indra/llcharacter/llvisualparam.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h index e6503d611d..0b516b9374 100644 --- a/indra/llcharacter/llvisualparam.h +++ b/indra/llcharacter/llvisualparam.h @@ -96,10 +96,9 @@ protected: //----------------------------------------------------------------------------- class LLVisualParam { -protected: - typedef boost::function<LLVisualParam*(S32)> visual_param_mapper; - public: + typedef boost::function<LLVisualParam*(S32)> visual_param_mapper; + LLVisualParam(); virtual ~LLVisualParam(); @@ -119,7 +118,7 @@ public: virtual void animate(F32 delta, BOOL set_by_user); virtual void stopAnimating(BOOL set_by_user); - virtual BOOL linkDrivenParams(visual_param_mapper mapper, bool only_cross_params); + virtual BOOL linkDrivenParams(visual_param_mapper mapper, BOOL only_cross_params); virtual void resetDrivenParams(); // Interface methods @@ -161,7 +160,6 @@ protected: S32 mID; // id for storing weight/morphtarget compares compactly LLVisualParamInfo *mInfo; - }; #endif // LL_LLVisualParam_H |