diff options
author | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
commit | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch) | |
tree | ff387e884e25eaa8a47adff4110ce02edfe67387 /indra/llappearance/llavatarjointmesh.h | |
parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
parent | 6661628d5c68855ddffc54a3f2578f93ada84de1 (diff) |
Merge with release
Diffstat (limited to 'indra/llappearance/llavatarjointmesh.h')
-rw-r--r-- | indra/llappearance/llavatarjointmesh.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h index 6486932cdf..5980b29b46 100644 --- a/indra/llappearance/llavatarjointmesh.h +++ b/indra/llappearance/llavatarjointmesh.h @@ -82,7 +82,6 @@ public: static BOOL sPipelineRender; //RN: this is here for testing purposes static U32 sClothingMaskImageName; - static EAvatarRenderPass sRenderPass; static LLColor4 sClothingInnerColor; public: |