QAR-907: svn merge -r 98908:98910...
QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
Showing
- indra/cmake/GooglePerfTools.cmake 1 addition, 1 deletionindra/cmake/GooglePerfTools.cmake
- indra/lib/python/indra/util/llperformance.py 158 additions, 0 deletionsindra/lib/python/indra/util/llperformance.py
- indra/lib/python/indra/util/simperf_host_xml_parser.py 338 additions, 0 deletionsindra/lib/python/indra/util/simperf_host_xml_parser.py
- indra/lib/python/indra/util/simperf_oprof_interface.py 160 additions, 0 deletionsindra/lib/python/indra/util/simperf_oprof_interface.py
- indra/lib/python/indra/util/simperf_proc_interface.py 164 additions, 0 deletionsindra/lib/python/indra/util/simperf_proc_interface.py
- indra/llcommon/llstat.cpp 438 additions, 11 deletionsindra/llcommon/llstat.cpp
- indra/llcommon/llstat.h 97 additions, 16 deletionsindra/llcommon/llstat.h
- indra/llcommon/llstatenums.h 10 additions, 7 deletionsindra/llcommon/llstatenums.h
- indra/llcommon/lltimer.cpp 48 additions, 5 deletionsindra/llcommon/lltimer.cpp
- indra/llcommon/lltimer.h 1 addition, 0 deletionsindra/llcommon/lltimer.h
- indra/llmessage/lliohttpserver.cpp 5 additions, 0 deletionsindra/llmessage/lliohttpserver.cpp
- indra/llmessage/llmessagetemplate.h 2 additions, 0 deletionsindra/llmessage/llmessagetemplate.h
- indra/llmessage/llpumpio.cpp 5 additions, 1 deletionindra/llmessage/llpumpio.cpp
- indra/llvfs/llvfile.cpp 1 addition, 0 deletionsindra/llvfs/llvfile.cpp
- indra/newview/llstartup.cpp 75 additions, 40 deletionsindra/newview/llstartup.cpp
- indra/newview/llviewermessage.cpp 9 additions, 0 deletionsindra/newview/llviewermessage.cpp
- indra/newview/llviewerstats.h 3 additions, 0 deletionsindra/newview/llviewerstats.h
Loading
Please register or sign in to comment