diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:31:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:31:01 -0500 |
| commit | 1d30fe955442855dd3102a006d6e4120d2f416b4 (patch) | |
| tree | 1783c0818fb473e1bd8a5ed7a4622f45e30fc99d /indra/newview/llvoavatar.h | |
| parent | 9b42503379bc2e9698545543670306961f7db991 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-release
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rwxr-xr-x | indra/newview/llvoavatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 9d45a74ecc..0e4121f1c4 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -406,6 +406,7 @@ public: F32 getLastSkinTime() { return mLastSkinTime; } U32 renderTransparent(BOOL first_pass); void renderCollisionVolumes(); + void renderJoints(); static void deleteCachedImages(bool clearAll=true); static void destroyGL(); static void restoreGL(); |