From a50a2e170d4cf99507d2dd974aed7f73424376cf Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Wed, 1 Mar 2017 11:01:40 -0800
Subject: SL-321: fix merge removal of mIsFirstRun definition, remove
 pyinstaller from viewer cmake, now in VMP package cmake

---
 indra/newview/CMakeLists.txt | 50 --------------------------------------------
 indra/newview/llappviewer.h  |  2 ++
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 394a9c8578..9badc95a72 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1758,56 +1758,6 @@ if (WINDOWS)
     endif (FMODEX)
 
     get_filename_component(PYTHON_DIRECTORY ${PYTHON_EXECUTABLE} DIRECTORY)
-
-    # http://pythonhosted.org/PyInstaller/#options
-    add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SL_Launcher.exe
-    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
-    ARGS
-       --onefile 
-       --log-level WARN
-       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
-            ${CMAKE_SOURCE_DIR}/viewer_components/manager/SL_Launcher
-    COMMENT "Performing pyinstaller compile of SL_Launcher"
-)
-
-    add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/apply_update.exe
-    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
-    ARGS
-       --onefile 
-       --log-level WARN
-       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
-            ${CMAKE_SOURCE_DIR}/viewer_components/manager/apply_update.py
-    COMMENT "Performing pyinstaller compile of updater"
-)
-
-    add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/download_update.exe
-    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
-    ARGS
-       --onefile 
-       --log-level WARN
-       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
-            ${CMAKE_SOURCE_DIR}/viewer_components/manager/download_update.py
-    COMMENT "Performing pyinstaller compile of update downloader"
-)
-
-    add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/update_manager.exe
-    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
-    ARGS
-       --onefile 
-       --log-level WARN
-       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
-            ${CMAKE_SOURCE_DIR}/viewer_components/manager/update_manager.py
-    COMMENT "Performing pyinstaller compile of update manager"
-)
-
-add_custom_target(compile_w_viewer_launcher ALL DEPENDS ${CMAKE_CFG_INTDIR}/SL_Launcher.exe)
-add_custom_target(compile_w_viewer_updater ALL DEPENDS ${CMAKE_CFG_INTDIR}/apply_update.exe)
-add_custom_target(compile_w_viewer_downloader ALL DEPENDS ${CMAKE_CFG_INTDIR}/download_update.exe)
-add_custom_target(compile_w_viewer_update_manager ALL DEPENDS ${CMAKE_CFG_INTDIR}/update_manager.exe)
     
     add_custom_command(
       OUTPUT  ${CMAKE_CFG_INTDIR}/copy_touched.bat
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 91d79c4260..272209fc79 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -313,6 +313,8 @@ private:
 	// llcorehttp library init/shutdown helper
 	LLAppCoreHttp mAppCoreHttp;
 
+        bool mIsFirstRun;
+
 };
 
 // consts from viewer.h
-- 
cgit v1.2.3