merge changes for DRTVWR-149
Showing
- .hgignore 1 addition, 0 deletions.hgignore
- .hgtags 0 additions, 0 deletions.hgtags
- BuildParams 31 additions, 0 deletionsBuildParams
- indra/integration_tests/llimage_libtest/llimage_libtest.cpp 60 additions, 8 deletionsindra/integration_tests/llimage_libtest/llimage_libtest.cpp
- indra/llimage/llimage.cpp 17 additions, 7 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 14 additions, 3 deletionsindra/llimage/llimage.h
- indra/llimage/llimagej2c.cpp 41 additions, 44 deletionsindra/llimage/llimagej2c.cpp
- indra/llimage/llimagej2c.h 7 additions, 3 deletionsindra/llimage/llimagej2c.h
- indra/llkdu/llimagej2ckdu.cpp 260 additions, 68 deletionsindra/llkdu/llimagej2ckdu.cpp
- indra/llkdu/llimagej2ckdu.h 1 addition, 0 deletionsindra/llkdu/llimagej2ckdu.h
- indra/llkdu/tests/llimagej2ckdu_test.cpp 22 additions, 1 deletionindra/llkdu/tests/llimagej2ckdu_test.cpp
- indra/llmessage/llcurl.cpp 2 additions, 1 deletionindra/llmessage/llcurl.cpp
- indra/llprimitive/llprimitive.cpp 0 additions, 0 deletionsindra/llprimitive/llprimitive.cpp
- indra/llrender/llimagegl.cpp 16 additions, 150 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llimagegl.h 10 additions, 27 deletionsindra/llrender/llimagegl.h
- indra/llrender/llrender.cpp 0 additions, 8 deletionsindra/llrender/llrender.cpp
- indra/llui/llcontainerview.cpp 9 additions, 9 deletionsindra/llui/llcontainerview.cpp
- indra/llui/llstatbar.cpp 1 addition, 1 deletionindra/llui/llstatbar.cpp
- indra/newview/CMakeLists.txt 2 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/logcontrol.xml 5 additions, 3 deletionsindra/newview/app_settings/logcontrol.xml
Loading
Please register or sign in to comment