-
- Downloads
Merge branch 'master' into DRTVWR-518-ui
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml
No related branches found
No related tags found
Showing
- .clang-format 19 additions, 18 deletions.clang-format
- autobuild.xml 12 additions, 11 deletionsautobuild.xml
- doc/contributions.txt 7 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/00-Common.cmake 7 additions, 1 deletionindra/cmake/00-Common.cmake
- indra/cmake/Copy3rdPartyLibs.cmake 4 additions, 0 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/edit-me-to-trigger-new-build.txt 1 addition, 0 deletionsindra/edit-me-to-trigger-new-build.txt
- indra/llaudio/CMakeLists.txt 4 additions, 0 deletionsindra/llaudio/CMakeLists.txt
- indra/llaudio/llaudioengine_openal.cpp 1 addition, 1 deletionindra/llaudio/llaudioengine_openal.cpp
- indra/llcorehttp/_httpoprequest.cpp 14 additions, 5 deletionsindra/llcorehttp/_httpoprequest.cpp
- indra/llinventory/llsettingssky.cpp 3 additions, 0 deletionsindra/llinventory/llsettingssky.cpp
- indra/llmath/llvector4a.h 3 additions, 2 deletionsindra/llmath/llvector4a.h
- indra/llmessage/llcoproceduremanager.cpp 19 additions, 9 deletionsindra/llmessage/llcoproceduremanager.cpp
- indra/llmessage/llexperiencecache.cpp 8 additions, 8 deletionsindra/llmessage/llexperiencecache.cpp
- indra/llmessage/llexperiencecache.h 1 addition, 1 deletionindra/llmessage/llexperiencecache.h
- indra/llmessage/llteleportflags.h 2 additions, 0 deletionsindra/llmessage/llteleportflags.h
- indra/llrender/llimagegl.cpp 49 additions, 31 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llrender.cpp 50 additions, 38 deletionsindra/llrender/llrender.cpp
- indra/llrender/llrendertarget.cpp 5 additions, 5 deletionsindra/llrender/llrendertarget.cpp
- indra/llrender/llshadermgr.cpp 1 addition, 1 deletionindra/llrender/llshadermgr.cpp
- indra/llui/llaccordionctrl.cpp 31 additions, 0 deletionsindra/llui/llaccordionctrl.cpp
Loading
Please register or sign in to comment