-
- Downloads
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
No related branches found
No related tags found
Showing
- .github/workflows/build.yaml 93 additions, 0 deletions.github/workflows/build.yaml
- .github/workflows/pre-commit.yaml 18 additions, 0 deletions.github/workflows/pre-commit.yaml
- .github/workflows/stale.yaml 2 additions, 2 deletions.github/workflows/stale.yaml
- .pre-commit-config.yaml 3 additions, 4 deletions.pre-commit-config.yaml
- autobuild.xml 9 additions, 9 deletionsautobuild.xml
- doc/contributions.txt 4 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/00-Common.cmake 5 additions, 1 deletionindra/cmake/00-Common.cmake
- indra/cmake/Python.cmake 6 additions, 2 deletionsindra/cmake/Python.cmake
- indra/llappearance/llwearable.h 0 additions, 4 deletionsindra/llappearance/llwearable.h
- indra/llappearance/llwearabledata.cpp 0 additions, 40 deletionsindra/llappearance/llwearabledata.cpp
- indra/llappearance/llwearabledata.h 0 additions, 9 deletionsindra/llappearance/llwearabledata.h
- indra/llaudio/llaudioengine.cpp 48 additions, 55 deletionsindra/llaudio/llaudioengine.cpp
- indra/llaudio/llaudioengine.h 7 additions, 6 deletionsindra/llaudio/llaudioengine.h
- indra/llaudio/llaudioengine_fmodstudio.cpp 7 additions, 4 deletionsindra/llaudio/llaudioengine_fmodstudio.cpp
- indra/llaudio/llaudioengine_fmodstudio.h 1 addition, 0 deletionsindra/llaudio/llaudioengine_fmodstudio.h
- indra/llcharacter/llbvhloader.cpp 0 additions, 2 deletionsindra/llcharacter/llbvhloader.cpp
- indra/llcharacter/llkeyframemotion.cpp 14 additions, 7 deletionsindra/llcharacter/llkeyframemotion.cpp
- indra/llcommon/hbxxh.h 18 additions, 0 deletionsindra/llcommon/hbxxh.h
- indra/llcommon/indra_constants.h 1 addition, 0 deletionsindra/llcommon/indra_constants.h
- indra/llcommon/lldefs.h 17 additions, 31 deletionsindra/llcommon/lldefs.h
Loading
Please register or sign in to comment