merge with El Capitan and packaging fixes

22 files changed, 0 insertions, 0 deletions

diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt
index ced2b3dbcf..ced2b3dbcf 100755..100644
--- a/indra/integration_tests/CMakeLists.txt
+++ b/indra/integration_tests/CMakeLists.txt
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index 8a83ac498f..8a83ac498f 100755..100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
diff --git a/indra/integration_tests/llimage_libtest/filters/autocontrast.xml b/indra/integration_tests/llimage_libtest/filters/autocontrast.xml
index ec3d7561bd..ec3d7561bd 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/autocontrast.xml
+++ b/indra/integration_tests/llimage_libtest/filters/autocontrast.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/badtrip.xml b/indra/integration_tests/llimage_libtest/filters/badtrip.xml
index 14ee0baff3..14ee0baff3 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/badtrip.xml
+++ b/indra/integration_tests/llimage_libtest/filters/badtrip.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/brighten.xml b/indra/integration_tests/llimage_libtest/filters/brighten.xml
index 9b4232229f..9b4232229f 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/brighten.xml
+++ b/indra/integration_tests/llimage_libtest/filters/brighten.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/darken.xml b/indra/integration_tests/llimage_libtest/filters/darken.xml
index 5cec3589b6..5cec3589b6 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/darken.xml
+++ b/indra/integration_tests/llimage_libtest/filters/darken.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/lightleak.xml b/indra/integration_tests/llimage_libtest/filters/lightleak.xml
index 6fe496506e..6fe496506e 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/lightleak.xml
+++ b/indra/integration_tests/llimage_libtest/filters/lightleak.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/linearize.xml b/indra/integration_tests/llimage_libtest/filters/linearize.xml
index 23d0290e07..23d0290e07 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/linearize.xml
+++ b/indra/integration_tests/llimage_libtest/filters/linearize.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/miniature.xml b/indra/integration_tests/llimage_libtest/filters/miniature.xml
index 9aa8a87c6f..9aa8a87c6f 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/miniature.xml
+++ b/indra/integration_tests/llimage_libtest/filters/miniature.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/newsscreen.xml b/indra/integration_tests/llimage_libtest/filters/newsscreen.xml
index 50ed27c6db..50ed27c6db 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/newsscreen.xml
+++ b/indra/integration_tests/llimage_libtest/filters/newsscreen.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/pixelate.xml b/indra/integration_tests/llimage_libtest/filters/pixelate.xml
index f643419aa0..f643419aa0 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/pixelate.xml
+++ b/indra/integration_tests/llimage_libtest/filters/pixelate.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/posterize.xml b/indra/integration_tests/llimage_libtest/filters/posterize.xml
index 4d03df3c66..4d03df3c66 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/posterize.xml
+++ b/indra/integration_tests/llimage_libtest/filters/posterize.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/thematrix.xml b/indra/integration_tests/llimage_libtest/filters/thematrix.xml
index af9a5eced8..af9a5eced8 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/thematrix.xml
+++ b/indra/integration_tests/llimage_libtest/filters/thematrix.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/toycamera.xml b/indra/integration_tests/llimage_libtest/filters/toycamera.xml
index 4e76f6b2fb..4e76f6b2fb 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/toycamera.xml
+++ b/indra/integration_tests/llimage_libtest/filters/toycamera.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/video.xml b/indra/integration_tests/llimage_libtest/filters/video.xml
index fe17f3950a..fe17f3950a 100755..100644
--- a/indra/integration_tests/llimage_libtest/filters/video.xml
+++ b/indra/integration_tests/llimage_libtest/filters/video.xml
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index 3d27b4a5b5..3d27b4a5b5 100755..100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.h b/indra/integration_tests/llimage_libtest/llimage_libtest.h
index 63f3d46b50..63f3d46b50 100755..100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.h
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.h
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index 34e34c7e47..34e34c7e47 100755..100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index a0418f09d5..a0418f09d5 100755..100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.h b/indra/integration_tests/llui_libtest/llui_libtest.h
index d365ebb5e0..d365ebb5e0 100755..100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.h
+++ b/indra/integration_tests/llui_libtest/llui_libtest.h
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
index cbf6021119..cbf6021119 100755..100644
--- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.h b/indra/integration_tests/llui_libtest/llwidgetreg.h
index 30b915eee2..30b915eee2 100755..100644
--- a/indra/integration_tests/llui_libtest/llwidgetreg.h
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.h