-
- Downloads
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventorybridge.cpp # indra/newview/lltexturectrl.h # indra/newview/llvovolume.cpp
No related branches found
No related tags found
Showing
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llappearance/CMakeLists.txt 0 additions, 2 deletionsindra/llappearance/CMakeLists.txt
- indra/llcommon/llcallbacklist.cpp 1 addition, 1 deletionindra/llcommon/llcallbacklist.cpp
- indra/llinventory/llinventory.cpp 182 additions, 133 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llinventory.h 4 additions, 3 deletionsindra/llinventory/llinventory.h
- indra/llinventory/tests/inventorymisc_test.cpp 0 additions, 20 deletionsindra/llinventory/tests/inventorymisc_test.cpp
- indra/llmessage/llcoproceduremanager.cpp 20 additions, 1 deletionindra/llmessage/llcoproceduremanager.cpp
- indra/llmessage/message.cpp 1 addition, 0 deletionsindra/llmessage/message.cpp
- indra/llrender/CMakeLists.txt 2 additions, 0 deletionsindra/llrender/CMakeLists.txt
- indra/llrender/llfontgl.cpp 14 additions, 0 deletionsindra/llrender/llfontgl.cpp
- indra/llrender/llfontgl.h 2 additions, 0 deletionsindra/llrender/llfontgl.h
- indra/llrender/lltexturemanagerbridge.cpp 0 additions, 0 deletionsindra/llrender/lltexturemanagerbridge.cpp
- indra/llrender/lltexturemanagerbridge.h 0 additions, 1 deletionindra/llrender/lltexturemanagerbridge.h
- indra/llui/llbutton.cpp 2 additions, 1 deletionindra/llui/llbutton.cpp
- indra/llui/llfolderview.cpp 82 additions, 19 deletionsindra/llui/llfolderview.cpp
- indra/llui/llfolderview.h 17 additions, 2 deletionsindra/llui/llfolderview.h
- indra/llui/llfolderviewitem.cpp 136 additions, 17 deletionsindra/llui/llfolderviewitem.cpp
- indra/llui/llfolderviewitem.h 11 additions, 4 deletionsindra/llui/llfolderviewitem.h
- indra/llui/llfolderviewmodel.cpp 2 additions, 2 deletionsindra/llui/llfolderviewmodel.cpp
- indra/llui/llfolderviewmodel.h 5 additions, 3 deletionsindra/llui/llfolderviewmodel.h
Loading
Please register or sign in to comment