Merge viewer-development -> sunshine
No related branches found
No related tags found
Showing
- .hgtags 8 additions, 0 deletions.hgtags
- autobuild.xml 12 additions, 12 deletionsautobuild.xml
- indra/cmake/LLAddBuildTest.cmake 9 additions, 0 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/cmake/LLCommon.cmake 1 addition, 1 deletionindra/cmake/LLCommon.cmake
- indra/llcommon/CMakeLists.txt 1 addition, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llhandle.h 47 additions, 11 deletionsindra/llcommon/llhandle.h
- indra/llcommon/llstat.cpp 12 additions, 7 deletionsindra/llcommon/llstat.cpp
- indra/llcommon/llstat.h 3 additions, 3 deletionsindra/llcommon/llstat.h
- indra/llui/CMakeLists.txt 0 additions, 1 deletionindra/llui/CMakeLists.txt
- indra/newview/app_settings/cmd_line.xml 1 addition, 1 deletionindra/newview/app_settings/cmd_line.xml
- indra/newview/app_settings/settings.xml 2 additions, 2 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llappviewer.cpp 20 additions, 10 deletionsindra/newview/llappviewer.cpp
- indra/newview/llflexibleobject.cpp 1 addition, 0 deletionsindra/newview/llflexibleobject.cpp
- indra/newview/llfolderview.cpp 24 additions, 10 deletionsindra/newview/llfolderview.cpp
- indra/newview/llfolderview.h 2 additions, 0 deletionsindra/newview/llfolderview.h
- indra/newview/llfolderviewitem.cpp 4 additions, 0 deletionsindra/newview/llfolderviewitem.cpp
- indra/newview/llfolderviewitem.h 1 addition, 0 deletionsindra/newview/llfolderviewitem.h
- indra/newview/llinventorybridge.cpp 6 additions, 0 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llmachineid.cpp 13 additions, 5 deletionsindra/newview/llmachineid.cpp
- indra/newview/llpanellogin.cpp 54 additions, 18 deletionsindra/newview/llpanellogin.cpp
Loading
Please register or sign in to comment