diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
| commit | 9ed8b5299f2e5a8a912649e0e6aecaf89b034408 (patch) | |
| tree | e7c9ecc91fbbef0c26fd352f2743ac050d8f889e /indra/newview/llvoavatarself.h | |
| parent | 55731ee318e6e3c2e9998c6347cbd9d3635115c4 (diff) | |
| parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) | |
Merge from remote repo
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index a555d04a63..6e52b33634 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -57,6 +57,7 @@ public: virtual void markDead(); virtual void initInstance(); // Called after construction to initialize the class. protected: + /*virtual*/ BOOL loadAvatar(); BOOL loadAvatarSelf(); BOOL buildSkeletonSelf(const LLVOAvatarSkeletonInfo *info); BOOL buildMenus(); @@ -89,6 +90,7 @@ public: /*virtual*/ BOOL setVisualParamWeight(const char* param_name, F32 weight, BOOL set_by_user = FALSE ); /*virtual*/ BOOL setVisualParamWeight(S32 index, F32 weight, BOOL set_by_user = FALSE ); /*virtual*/ void updateVisualParams(); + /*virtual*/ void idleUpdateAppearanceAnimation(); private: // helper function. Passed in param is assumed to be in avatar's parameter list. |