Merge branch 'main' (DRTVWR-580) into DRTVWR-567
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp
No related branches found
No related tags found
Showing
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llcharacter/llkeyframemotion.cpp 30 additions, 4 deletionsindra/llcharacter/llkeyframemotion.cpp
- indra/llcommon/CMakeLists.txt 0 additions, 2 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llapp.cpp 2 additions, 42 deletionsindra/llcommon/llapp.cpp
- indra/llcommon/llapp.h 5 additions, 17 deletionsindra/llcommon/llapp.h
- indra/llcommon/llerror.h 0 additions, 1 deletionindra/llcommon/llerror.h
- indra/llcommon/llerrorthread.cpp 0 additions, 133 deletionsindra/llcommon/llerrorthread.cpp
- indra/llcommon/llerrorthread.h 0 additions, 46 deletionsindra/llcommon/llerrorthread.h
- indra/llmessage/llcachename.cpp 3 additions, 1 deletionindra/llmessage/llcachename.cpp
- indra/llprimitive/llmaterial.cpp 9 additions, 9 deletionsindra/llprimitive/llmaterial.cpp
- indra/llprimitive/llmaterial.h 1 addition, 1 deletionindra/llprimitive/llmaterial.h
- indra/llrender/llfontgl.cpp 15 additions, 9 deletionsindra/llrender/llfontgl.cpp
- indra/llrender/llfontgl.h 1 addition, 1 deletionindra/llrender/llfontgl.h
- indra/llrender/llimagegl.cpp 8 additions, 1 deletionindra/llrender/llimagegl.cpp
- indra/llui/llfolderviewitem.cpp 1 addition, 1 deletionindra/llui/llfolderviewitem.cpp
- indra/llui/lliconctrl.cpp 26 additions, 0 deletionsindra/llui/lliconctrl.cpp
- indra/llui/lliconctrl.h 3 additions, 0 deletionsindra/llui/lliconctrl.h
- indra/llui/llpanel.h 1 addition, 0 deletionsindra/llui/llpanel.h
- indra/llui/lltextbase.cpp 5 additions, 5 deletionsindra/llui/lltextbase.cpp
- indra/llui/lltextbase.h 1 addition, 1 deletionindra/llui/lltextbase.h
Loading
Please register or sign in to comment