diff options
| author | Simon Linden <simon@lindenlab.com> | 2013-03-25 14:44:58 -0700 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2013-03-25 14:44:58 -0700 |
| commit | a03e8f05d7314688e78090f5494b46416858e7b6 (patch) | |
| tree | 46f77ef1912e4c09304aaeaae0cb368f4407fe7d /indra | |
| parent | e1d133d73f93f52193397c5fe9cbfa532f4359ed (diff) | |
| parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
Pull in downstream code with CHUI, viewer-development and bug fixes in the pipeline
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 1554e9e665..0b0c74b3d3 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 3; const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 3d7407ab54..91394f0767 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1242,7 +1242,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) } } } - void LLDrawPoolAvatar::getRiggedGeometry(LLFace* face, LLPointer<LLVertexBuffer>& buffer, U32 data_mask, const LLMeshSkinInfo* skin, LLVolume* volume, const LLVolumeFace& vol_face) { face->setGeomIndex(0); |