Merge branch master (D540) into DRTVWR-546
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
No related branches found
No related tags found
Showing
- .pre-commit-config.yaml 17 additions, 0 deletions.pre-commit-config.yaml
- autobuild.xml 3 additions, 3 deletionsautobuild.xml
- indra/llaudio/llaudioengine.cpp 9 additions, 0 deletionsindra/llaudio/llaudioengine.cpp
- indra/llaudio/llaudioengine.h 7 additions, 1 deletionindra/llaudio/llaudioengine.h
- indra/llcommon/llcoros.cpp 19 additions, 8 deletionsindra/llcommon/llcoros.cpp
- indra/llcommon/lleventcoro.cpp 1 addition, 1 deletionindra/llcommon/lleventcoro.cpp
- indra/llcommon/llsdutil.cpp 4 additions, 3 deletionsindra/llcommon/llsdutil.cpp
- indra/llcommon/llsdutil.h 2 additions, 2 deletionsindra/llcommon/llsdutil.h
- indra/llcommon/llsys.cpp 14 additions, 14 deletionsindra/llcommon/llsys.cpp
- indra/llmath/llvolume.cpp 28 additions, 3 deletionsindra/llmath/llvolume.cpp
- indra/llui/lllineeditor.cpp 15 additions, 2 deletionsindra/llui/lllineeditor.cpp
- indra/llui/lllineeditor.h 2 additions, 0 deletionsindra/llui/lllineeditor.h
- indra/llui/llmenugl.cpp 47 additions, 5 deletionsindra/llui/llmenugl.cpp
- indra/llui/llmenugl.h 4 additions, 1 deletionindra/llui/llmenugl.h
- indra/llui/llurlentry.cpp 18 additions, 0 deletionsindra/llui/llurlentry.cpp
- indra/llui/llurlentry.h 11 additions, 0 deletionsindra/llui/llurlentry.h
- indra/llui/llurlregistry.cpp 1 addition, 1 deletionindra/llui/llurlregistry.cpp
- indra/llwindow/llwindowwin32.cpp 2 additions, 1 deletionindra/llwindow/llwindowwin32.cpp
- indra/newview/CMakeLists.txt 3 additions, 5 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/cmd_line.xml 0 additions, 8 deletionsindra/newview/app_settings/cmd_line.xml
Loading
Please register or sign in to comment