From e55fcbeeee1d1000d06b64ef9f07a7f871ce2d83 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 21 Feb 2018 17:32:06 +0000
Subject: MAINT-8297 Removing old ca bundle

---
 indra/newview/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/CMakeLists.txt')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6b16713add..dff907f714 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1624,7 +1624,6 @@ set(viewer_APPSETTINGS_FILES
     app_settings/viewerart.xml
     ${CMAKE_SOURCE_DIR}/../etc/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
-    ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
     packages-info.txt
     )
 
-- 
cgit v1.2.3


From 2835e77640feb0236e54605f9f80b947c0ac5979 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 13 Feb 2018 15:40:21 +0200
Subject: MAINT-8203 Use the ReadOfflineMsgs cap to fetch IMs after login

---
 indra/newview/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/CMakeLists.txt')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index dff907f714..23337ddbfb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -345,6 +345,7 @@ set(viewer_SOURCE_FILES
     llhudview.cpp
     llimagefiltersmanager.cpp
     llimhandler.cpp
+    llimprocessing.cpp
     llimview.cpp
     llinspect.cpp
     llinspectavatar.cpp
@@ -966,6 +967,7 @@ set(viewer_HEADER_FILES
     llhudtext.h
     llhudview.h
     llimagefiltersmanager.h
+    llimprocessing.h
     llimview.h
     llinspect.h
     llinspectavatar.h
-- 
cgit v1.2.3