diff options
| author | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
| commit | 0d8f1077a62099915cb532dc354d0e450e3e6a79 (patch) | |
| tree | f76f43d025304bc6aa65d3f91663cac67a6715cc /indra/newview/llface.h | |
| parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
| parent | 7dbb8860373769dfca7d6c6588284866a1bf86a3 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index de4d03351c..15c9e7856f 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -262,11 +262,11 @@ public: LLVector2 mTexExtents[2]; F32 mDistance; - F32 mLastUpdateTime; - F32 mLastSkinTime; - F32 mLastMoveTime; - LLMatrix4* mTextureMatrix; - LLDrawInfo* mDrawInfo; + F32 mLastUpdateTime; + F32 mLastSkinTime; + F32 mLastMoveTime; + LLMatrix4* mTextureMatrix; + LLDrawInfo* mDrawInfo; private: LLPointer<LLVertexBuffer> mVertexBuffer; |