-
- Downloads
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
No related branches found
No related tags found
Showing
- BuildParams 4 additions, 0 deletionsBuildParams
- autobuild.xml 30 additions, 30 deletionsautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/Python.cmake 14 additions, 34 deletionsindra/cmake/Python.cmake
- indra/cmake/run_build_test.py 8 additions, 10 deletionsindra/cmake/run_build_test.py
- indra/copy_win_scripts/start-client.py 5 additions, 5 deletionsindra/copy_win_scripts/start-client.py
- indra/fix-incredibuild.py 2 additions, 2 deletionsindra/fix-incredibuild.py
- indra/lib/python/indra/ipc/llmessage.py 6 additions, 6 deletionsindra/lib/python/indra/ipc/llmessage.py
- indra/lib/python/indra/ipc/tokenstream.py 1 addition, 1 deletionindra/lib/python/indra/ipc/tokenstream.py
- indra/lib/python/indra/util/llmanifest.py 47 additions, 52 deletionsindra/lib/python/indra/util/llmanifest.py
- indra/lib/python/indra/util/test_win32_manifest.py 24 additions, 24 deletionsindra/lib/python/indra/util/test_win32_manifest.py
- indra/llaudio/llaudioengine_fmodstudio.cpp 1 addition, 1 deletionindra/llaudio/llaudioengine_fmodstudio.cpp
- indra/llaudio/llstreamingaudio_fmodstudio.cpp 96 additions, 28 deletionsindra/llaudio/llstreamingaudio_fmodstudio.cpp
- indra/llaudio/llstreamingaudio_fmodstudio.h 3 additions, 0 deletionsindra/llaudio/llstreamingaudio_fmodstudio.h
- indra/llcharacter/llkeyframemotion.h 9 additions, 0 deletionsindra/llcharacter/llkeyframemotion.h
- indra/llcharacter/llmotion.h 3 additions, 0 deletionsindra/llcharacter/llmotion.h
- indra/llcommon/llerror.cpp 5 additions, 5 deletionsindra/llcommon/llerror.cpp
- indra/llcommon/llleap.cpp 1 addition, 1 deletionindra/llcommon/llleap.cpp
- indra/llcommon/llmetricperformancetester.cpp 0 additions, 1 deletionindra/llcommon/llmetricperformancetester.cpp
- indra/llcommon/llsys.cpp 30 additions, 3 deletionsindra/llcommon/llsys.cpp
Loading
Please register or sign in to comment