Merge branch 'main' into DRTVWR-577-maint-S
No related branches found
No related tags found
Showing
- doc/contributions.txt 3 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/Copy3rdPartyLibs.cmake 2 additions, 1 deletionindra/cmake/Copy3rdPartyLibs.cmake
- indra/edit-me-to-trigger-new-build.txt 1 addition, 4 deletionsindra/edit-me-to-trigger-new-build.txt
- indra/integration_tests/llui_libtest/CMakeLists.txt 3 additions, 10 deletionsindra/integration_tests/llui_libtest/CMakeLists.txt
- indra/llcommon/tests/llprocess_test.cpp 20 additions, 20 deletionsindra/llcommon/tests/llprocess_test.cpp
- indra/llui/llscrolllistcell.cpp 72 additions, 0 deletionsindra/llui/llscrolllistcell.cpp
- indra/llui/llscrolllistcell.h 22 additions, 0 deletionsindra/llui/llscrolllistcell.h
- indra/llwindow/llwindow.cpp 2 additions, 1 deletionindra/llwindow/llwindow.cpp
- indra/llwindow/llwindow.h 3 additions, 0 deletionsindra/llwindow/llwindow.h
- indra/llwindow/llwindowmacosx.cpp 9 additions, 0 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowwin32.cpp 2 additions, 1 deletionindra/llwindow/llwindowwin32.cpp
- indra/newview/CMakeLists.txt 7 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/commands.xml 10 additions, 0 deletionsindra/newview/app_settings/commands.xml
- indra/newview/app_settings/settings.xml 188 additions, 1 deletionindra/newview/app_settings/settings.xml
- indra/newview/app_settings/toolbars.xml 1 addition, 0 deletionsindra/newview/app_settings/toolbars.xml
- indra/newview/featuretable.txt 10 additions, 4 deletionsindra/newview/featuretable.txt
- indra/newview/featuretable_mac.txt 11 additions, 5 deletionsindra/newview/featuretable_mac.txt
- indra/newview/llagent.cpp 4 additions, 0 deletionsindra/newview/llagent.cpp
- indra/newview/llappviewer.cpp 83 additions, 75 deletionsindra/newview/llappviewer.cpp
Loading
Please register or sign in to comment