Age | Commit message (Collapse) | Author |
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
(transplanted from 9b6ce276fa8d72109208e84c65890b0d06dba5db)
|
|
Checker: UNINIT_CTOR
Function: LLDrawPoolAvatar::LLDrawPoolAvatar()
File: /indra/newview/lldrawpoolavatar.cpp
not a bug, just a dead member...
|
|
|
|
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
|
|
(maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
|
|
|