diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
| commit | 744381956022c74b8617098ab28b52230dfbd0c2 (patch) | |
| tree | b53aafab1f3067c78bc0564bada8da9bff82a48f /indra/newview/llvoavatar.h | |
| parent | 80ee8a8ca3725265636f8052a2442a74a742338f (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge. Refresh from viewer-release after 3.7.0 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(); |