4c4da8aca2
Fix the Mac and Linux build after llwearable breakage. Needed to add
...
an explicit include for LLViewerFetchedTexture because it's used for
a template specialization, and fixed LLLocalTextureObject constructor
to take a const LLUUID reference so locals can be passed.
2009-10-22 12:22:06 +01:00
5164ed388c
Code audit for r136515 ("merging in new wearable infrastructure...")
...
No expected functionality change; this mostly contains cosmetic cleanup.
Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
d08b0b6ae8
merging in new wearable infrastructure to get a step closer to eventually 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-10-16 17:56:30 +00:00
9ecdbd8b72
QAR-1602 checkpoint for multiple textures
...
Fixing merge problems - updating LLLocalTextureObject (new class) to work with Bao's texture refactoring.
-Nyx
2009-07-14 17:14:40 +00:00
29e5f09d12
QAR-1602 checkpoint for avatar pipeline multiple textures
...
merge missed the addition of two new files. committing separately.
-Nyx
2009-07-14 15:50:34 +00:00
Lynx Linden