Merge branch 'master' into DRTVWR-489-emoji
No related branches found
No related tags found
Showing
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llappearance/llavatarappearance.cpp 3 additions, 1 deletionindra/llappearance/llavatarappearance.cpp
- indra/llappearance/llpolymesh.cpp 5 additions, 3 deletionsindra/llappearance/llpolymesh.cpp
- indra/llappearance/llpolymorph.cpp 3 additions, 1 deletionindra/llappearance/llpolymorph.cpp
- indra/llaudio/llaudiodecodemgr.cpp 227 additions, 119 deletionsindra/llaudio/llaudiodecodemgr.cpp
- indra/llaudio/llaudiodecodemgr.h 7 additions, 8 deletionsindra/llaudio/llaudiodecodemgr.h
- indra/llaudio/llaudioengine.cpp 47 additions, 58 deletionsindra/llaudio/llaudioengine.cpp
- indra/llaudio/llaudioengine.h 36 additions, 33 deletionsindra/llaudio/llaudioengine.h
- indra/llaudio/llaudioengine_fmodstudio.cpp 7 additions, 7 deletionsindra/llaudio/llaudioengine_fmodstudio.cpp
- indra/llaudio/llaudioengine_fmodstudio.h 1 addition, 1 deletionindra/llaudio/llaudioengine_fmodstudio.h
- indra/llaudio/llaudioengine_openal.cpp 2 additions, 2 deletionsindra/llaudio/llaudioengine_openal.cpp
- indra/llaudio/llaudioengine_openal.h 1 addition, 1 deletionindra/llaudio/llaudioengine_openal.h
- indra/llcharacter/llkeyframemotion.cpp 39 additions, 6 deletionsindra/llcharacter/llkeyframemotion.cpp
- indra/llcharacter/llkeyframemotion.h 5 additions, 2 deletionsindra/llcharacter/llkeyframemotion.h
- indra/llcommon/CMakeLists.txt 5 additions, 6 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llmemory.cpp 3 additions, 5 deletionsindra/llcommon/llmemory.cpp
- indra/llcommon/llrefcount.cpp 1 addition, 1 deletionindra/llcommon/llrefcount.cpp
- indra/llcommon/llsys.cpp 3 additions, 18 deletionsindra/llcommon/llsys.cpp
- indra/llcommon/llsys_objc.h 33 additions, 0 deletionsindra/llcommon/llsys_objc.h
- indra/llcommon/llsys_objc.mm 64 additions, 0 deletionsindra/llcommon/llsys_objc.mm
Loading
Please register or sign in to comment