diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
| commit | d08b0b6ae8bcd452a3d707ac153107d0f1523df8 (patch) | |
| tree | 3caac3468a18b105e5aa5eb53cd13ed416c1a48d /indra/llcharacter/llvisualparam.h | |
| parent | 087897b1f837872fc02822595e5dd47fabf3b7e8 (diff) | |
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
Diffstat (limited to 'indra/llcharacter/llvisualparam.h')
| -rw-r--r-- | indra/llcharacter/llvisualparam.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h index 25c41e8509..b2b697766f 100644 --- a/indra/llcharacter/llvisualparam.h +++ b/indra/llcharacter/llvisualparam.h @@ -36,6 +36,7 @@ #include "v3math.h" #include "llstring.h" #include "llxmltree.h" +#include <boost/function.hpp> class LLPolyMesh; class LLXmlTreeNode; @@ -68,6 +69,10 @@ public: virtual ~LLVisualParamInfo() {}; virtual BOOL parseXml(LLXmlTreeNode *node); + + S32 getID() const { return mID; } + + virtual void toStream(std::ostream &out); protected: S32 mID; // ID associated with VisualParam @@ -91,6 +96,9 @@ protected: //----------------------------------------------------------------------------- class LLVisualParam { +protected: + typedef boost::function<LLVisualParam*(S32)> visual_param_mapper; + public: LLVisualParam(); virtual ~LLVisualParam(); @@ -111,6 +119,8 @@ 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); + // Interface methods S32 getID() const { return mID; } void setID(S32 id) { llassert(!mInfo); mID = id; } @@ -150,6 +160,7 @@ protected: S32 mID; // id for storing weight/morphtarget compares compactly LLVisualParamInfo *mInfo; + }; #endif // LL_LLVisualParam_H |