Merge. Refresh from viewer-release after 3.7.0 release
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- build.sh 7 additions, 0 deletionsbuild.sh
- doc/contributions.txt 20 additions, 0 deletionsdoc/contributions.txt
- indra/lib/python/indra/base/lluuid.py 1 addition, 1 deletionindra/lib/python/indra/base/lluuid.py
- indra/llaudio/llaudiodecodemgr.cpp 28 additions, 28 deletionsindra/llaudio/llaudiodecodemgr.cpp
- indra/llaudio/llaudioengine.cpp 45 additions, 39 deletionsindra/llaudio/llaudioengine.cpp
- indra/llmath/llvolume.cpp 1 addition, 1 deletionindra/llmath/llvolume.cpp
- indra/llrender/llglslshader.cpp 8 additions, 1 deletionindra/llrender/llglslshader.cpp
- indra/llrender/llshadermgr.cpp 21 additions, 9 deletionsindra/llrender/llshadermgr.cpp
- indra/llrender/llshadermgr.h 2 additions, 1 deletionindra/llrender/llshadermgr.h
- indra/llui/llbutton.cpp 1 addition, 1 deletionindra/llui/llbutton.cpp
- indra/llui/llcommandmanager.cpp 0 additions, 4 deletionsindra/llui/llcommandmanager.cpp
- indra/llui/llcommandmanager.h 0 additions, 7 deletionsindra/llui/llcommandmanager.h
- indra/llui/lltabcontainer.cpp 3 additions, 20 deletionsindra/llui/lltabcontainer.cpp
- indra/llui/lltabcontainer.h 1 addition, 10 deletionsindra/llui/lltabcontainer.h
- indra/llui/lltoolbar.cpp 0 additions, 2 deletionsindra/llui/lltoolbar.cpp
- indra/llwindow/llopenglview-objc.mm 0 additions, 7 deletionsindra/llwindow/llopenglview-objc.mm
- indra/newview/CMakeLists.txt 2 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/commands.xml 0 additions, 48 deletionsindra/newview/app_settings/commands.xml
Loading
Please register or sign in to comment