merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Showing
- doc/releasenotes-where.txt 3 additions, 3 deletionsdoc/releasenotes-where.txt
- indra/CMakeLists.txt 7 additions, 0 deletionsindra/CMakeLists.txt
- indra/cmake/00-Common.cmake 2 additions, 1 deletionindra/cmake/00-Common.cmake
- indra/cmake/Linking.cmake 2 additions, 0 deletionsindra/cmake/Linking.cmake
- indra/llcommon/llsecondlifeurls.cpp 2 additions, 2 deletionsindra/llcommon/llsecondlifeurls.cpp
- indra/llcommon/llsecondlifeurls.h 2 additions, 2 deletionsindra/llcommon/llsecondlifeurls.h
- indra/llmath/llvolume.cpp 1 addition, 1 deletionindra/llmath/llvolume.cpp
- indra/llrender/llgl.cpp 9 additions, 6 deletionsindra/llrender/llgl.cpp
- indra/llrender/llgl.h 3 additions, 3 deletionsindra/llrender/llgl.h
- indra/llrender/llrendertarget.cpp 5 additions, 0 deletionsindra/llrender/llrendertarget.cpp
- indra/llui/lltexteditor.cpp 1 addition, 1 deletionindra/llui/lltexteditor.cpp
- indra/llvfs/llvfs.cpp 14 additions, 11 deletionsindra/llvfs/llvfs.cpp
- indra/llwindow/llwindowmacosx.cpp 19 additions, 0 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowmacosx.h 3 additions, 0 deletionsindra/llwindow/llwindowmacosx.h
- indra/llwindow/llwindowwin32.cpp 25 additions, 1 deletionindra/llwindow/llwindowwin32.cpp
- indra/newview/CMakeLists.txt 0 additions, 2 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 13 additions, 2 deletionsindra/newview/app_settings/settings.xml
- indra/newview/featuretable_mac.txt 2 additions, 0 deletionsindra/newview/featuretable_mac.txt
- indra/newview/gpu_table.txt 25 additions, 14 deletionsindra/newview/gpu_table.txt
- indra/newview/installers/darwin/firstlook-dmg/Applications-alias.r 6996 additions, 0 deletions...view/installers/darwin/firstlook-dmg/Applications-alias.r
Loading
Please register or sign in to comment