summaryrefslogtreecommitdiff
path: root/indra/newview/lllocaltextureobject.h
AgeCommit message (Collapse)Author
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-07-14QAR-1602 checkpoint for multiple texturesNeal Orman
Fixing merge problems - updating LLLocalTextureObject (new class) to work with Bao's texture refactoring. -Nyx
2009-07-14QAR-1602 checkpoint for avatar pipeline multiple texturesNeal Orman
merge missed the addition of two new files. committing separately. -Nyx
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 06:35:17 +0000