Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llcommon/imageids.h 1 addition, 0 deletionsindra/llcommon/imageids.h
- indra/llrender/llimagegl.cpp 1 addition, 3 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llrender.cpp 13 additions, 7 deletionsindra/llrender/llrender.cpp
- indra/llui/llpanel.cpp 5 additions, 1 deletionindra/llui/llpanel.cpp
- indra/llui/llpanel.h 1 addition, 1 deletionindra/llui/llpanel.h
- indra/llui/lltabcontainer.cpp 40 additions, 7 deletionsindra/llui/lltabcontainer.cpp
- indra/llui/lltabcontainer.h 9 additions, 1 deletionindra/llui/lltabcontainer.h
- indra/newview/CMakeLists.txt 2 additions, 2 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 22 additions, 11 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.cpp 45 additions, 62 deletionsindra/newview/llagent.cpp
- indra/newview/llappearance.h 4 additions, 4 deletionsindra/newview/llappearance.h
- indra/newview/llassetuploadresponders.cpp 44 additions, 0 deletionsindra/newview/llassetuploadresponders.cpp
- indra/newview/llassetuploadresponders.h 16 additions, 0 deletionsindra/newview/llassetuploadresponders.h
- indra/newview/lldrawpoolavatar.cpp 1 addition, 1 deletionindra/newview/lldrawpoolavatar.cpp
- indra/newview/lldrawpoolavatar.h 6 additions, 1 deletionindra/newview/lldrawpoolavatar.h
- indra/newview/llfloateranimpreview.cpp 1 addition, 1 deletionindra/newview/llfloateranimpreview.cpp
- indra/newview/llfloateravatartextures.cpp 12 additions, 44 deletionsindra/newview/llfloateravatartextures.cpp
- indra/newview/llfloateravatartextures.h 2 additions, 20 deletionsindra/newview/llfloateravatartextures.h
- indra/newview/llhudtext.cpp 11 additions, 7 deletionsindra/newview/llhudtext.cpp
Loading
Please register or sign in to comment