diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/llvoavatar.h | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
| -rw-r--r-- | linden/indra/newview/llvoavatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index d4c5e8a..d66ddfc 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
| @@ -693,6 +693,7 @@ public: | |||
| 693 | typedef std::multimap<std::string, LLPolyMesh*> mesh_map_t; | 693 | typedef std::multimap<std::string, LLPolyMesh*> mesh_map_t; |
| 694 | mesh_map_t mMeshes; | 694 | mesh_map_t mMeshes; |
| 695 | 695 | ||
| 696 | S32 mNumInitFaces ; //number of faces generated when creating the avatar drawable, does not inculde splitted faces due to long vertex buffer. | ||
| 696 | //-------------------------------------------------------------------- | 697 | //-------------------------------------------------------------------- |
| 697 | // true if this avatar is for this viewers agent | 698 | // true if this avatar is for this viewers agent |
| 698 | //-------------------------------------------------------------------- | 699 | //-------------------------------------------------------------------- |