QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
Showing
- doc/contributions.txt 5 additions, 1 deletiondoc/contributions.txt
- indra/cmake/CMakeLists.txt 1 addition, 0 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/DBusGlib.cmake 29 additions, 0 deletionsindra/cmake/DBusGlib.cmake
- indra/llcharacter/llbvhloader.cpp 36 additions, 9 deletionsindra/llcharacter/llbvhloader.cpp
- indra/llcharacter/llmotioncontroller.cpp 5 additions, 0 deletionsindra/llcharacter/llmotioncontroller.cpp
- indra/llcommon/llstring.h 18 additions, 12 deletionsindra/llcommon/llstring.h
- indra/llimagej2coj/llimagej2coj.cpp 16 additions, 3 deletionsindra/llimagej2coj/llimagej2coj.cpp
- indra/llmessage/llmessagetemplate.cpp 1 addition, 1 deletionindra/llmessage/llmessagetemplate.cpp
- indra/llui/lllineeditor.cpp 12 additions, 13 deletionsindra/llui/lllineeditor.cpp
- indra/llui/lllineeditor.h 0 additions, 1 deletionindra/llui/lllineeditor.h
- indra/llui/lltexteditor.h 2 additions, 2 deletionsindra/llui/lltexteditor.h
- indra/llwindow/llwindow.cpp 6 additions, 0 deletionsindra/llwindow/llwindow.cpp
- indra/llwindow/llwindow.h 1 addition, 0 deletionsindra/llwindow/llwindow.h
- indra/llwindow/llwindowsdl.cpp 35 additions, 27 deletionsindra/llwindow/llwindowsdl.cpp
- indra/llwindow/llwindowsdl.h 11 additions, 14 deletionsindra/llwindow/llwindowsdl.h
- indra/newview/CMakeLists.txt 3 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/keywords.ini 5 additions, 5 deletionsindra/newview/app_settings/keywords.ini
- indra/newview/llagent.cpp 4 additions, 1 deletionindra/newview/llagent.cpp
- indra/newview/llappviewer.cpp 27 additions, 35 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewer.h 5 additions, 2 deletionsindra/newview/llappviewer.h
Loading
Please register or sign in to comment