merging in new wearable infrastructure to get a step closer to eventually...
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
Showing
- indra/llcharacter/llcharacter.h 3 additions, 3 deletionsindra/llcharacter/llcharacter.h
- indra/llcharacter/llvisualparam.cpp 23 additions, 0 deletionsindra/llcharacter/llvisualparam.cpp
- indra/llcharacter/llvisualparam.h 11 additions, 0 deletionsindra/llcharacter/llvisualparam.h
- indra/llui/llscrollingpanellist.cpp 3 additions, 1 deletionindra/llui/llscrollingpanellist.cpp
- indra/llui/llscrollingpanellist.h 1 addition, 1 deletionindra/llui/llscrollingpanellist.h
- indra/llvfs/lldir_linux.cpp 13 additions, 1 deletionindra/llvfs/lldir_linux.cpp
- indra/newview/CMakeLists.txt 4 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/character/avatar_lad.xml 10255 additions, 10195 deletionsindra/newview/character/avatar_lad.xml
- indra/newview/llagent.cpp 2 additions, 2 deletionsindra/newview/llagent.cpp
- indra/newview/llagentwearables.cpp 134 additions, 85 deletionsindra/newview/llagentwearables.cpp
- indra/newview/llagentwearables.h 10 additions, 2 deletionsindra/newview/llagentwearables.h
- indra/newview/lldriverparam.cpp 168 additions, 18 deletionsindra/newview/lldriverparam.cpp
- indra/newview/lldriverparam.h 12 additions, 0 deletionsindra/newview/lldriverparam.h
- indra/newview/llfloateravatartextures.cpp 39 additions, 2 deletionsindra/newview/llfloateravatartextures.cpp
- indra/newview/lllocaltextureobject.cpp 94 additions, 28 deletionsindra/newview/lllocaltextureobject.cpp
- indra/newview/lllocaltextureobject.h 14 additions, 7 deletionsindra/newview/lllocaltextureobject.h
- indra/newview/llpaneleditwearable.cpp 658 additions, 0 deletionsindra/newview/llpaneleditwearable.cpp
- indra/newview/llpaneleditwearable.h 114 additions, 0 deletionsindra/newview/llpaneleditwearable.h
- indra/newview/llpolymesh.cpp 8 additions, 0 deletionsindra/newview/llpolymesh.cpp
- indra/newview/llpolymesh.h 3 additions, 0 deletionsindra/newview/llpolymesh.h
Loading
Please register or sign in to comment