summaryrefslogtreecommitdiff
path: root/indra/newview/character
AgeCommit message (Collapse)Author
2009-10-28mergeSteve Bennetts
2009-10-26Fix for DEV-39996 / EXT-942. Avatar hair and eyelashes had lost partial ↵Eric Tulla
transparency. -Reviewed by nyx (simpler xml fix for hair suggested by him as well)
2009-10-19mergeSteve Bennetts
2009-10-16merging in new wearable infrastructure to get a step closer to eventually ↵Neal Orman
supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command: svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 . Progress can be tracked in DEV-32551. -Nyx
2009-08-31Merge with trunkBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-29Merge with SVN trunkBryan O'Sullivan
2009-05-22svn merge -r121194:121210Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-04-14Re-add character data.Bryan O'Sullivan
2009-04-14Re-add character data.Bryan O'Sullivan
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:58:09 +0000