merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
Showing
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llcommon/llversionviewer.h 1 addition, 1 deletionindra/llcommon/llversionviewer.h
- indra/llrender/llrendertarget.cpp 10 additions, 0 deletionsindra/llrender/llrendertarget.cpp
- indra/llrender/llrendertarget.h 3 additions, 0 deletionsindra/llrender/llrendertarget.h
- indra/llrender/llvertexbuffer.cpp 16 additions, 0 deletionsindra/llrender/llvertexbuffer.cpp
- indra/llui/llfloater.cpp 2 additions, 0 deletionsindra/llui/llfloater.cpp
- indra/llui/lltabcontainer.cpp 1 addition, 1 deletionindra/llui/lltabcontainer.cpp
- indra/newview/app_settings/settings.xml 4 additions, 4 deletionsindra/newview/app_settings/settings.xml
- indra/newview/gpu_table.txt 1 addition, 0 deletionsindra/newview/gpu_table.txt
- indra/newview/lldrawpoolalpha.cpp 0 additions, 4 deletionsindra/newview/lldrawpoolalpha.cpp
- indra/newview/llface.cpp 2 additions, 1 deletionindra/newview/llface.cpp
- indra/newview/llfloateranimpreview.cpp 47 additions, 17 deletionsindra/newview/llfloateranimpreview.cpp
- indra/newview/llfloateranimpreview.h 3 additions, 0 deletionsindra/newview/llfloateranimpreview.h
- indra/newview/llfloatertools.cpp 1 addition, 1 deletionindra/newview/llfloatertools.cpp
- indra/newview/llselectmgr.cpp 1 addition, 0 deletionsindra/newview/llselectmgr.cpp
- indra/newview/llspatialpartition.cpp 1 addition, 1 deletionindra/newview/llspatialpartition.cpp
- indra/newview/llviewerdisplay.cpp 2 additions, 4 deletionsindra/newview/llviewerdisplay.cpp
- indra/newview/llviewerobject.cpp 7 additions, 2 deletionsindra/newview/llviewerobject.cpp
- indra/newview/llviewerwindow.cpp 31 additions, 30 deletionsindra/newview/llviewerwindow.cpp
- indra/newview/llvoicevisualizer.cpp 2 additions, 1 deletionindra/newview/llvoicevisualizer.cpp
Loading
Please register or sign in to comment