Add build expirey off switch

indra/cmake/Variables.cmake

@@ -48,6 +48,8 @@ set(VIEWER_SYMBOL_FILE "" CACHE STRING "Name of tarball into which to place symb
 option(USE_CEF "Enable CEF media plugin" ON)
 option(USE_VLC "Enable VLC media plugin" ON)
 
+option(BUILD_EXPIREY "Use build expirey system" ON)
+
 if(LIBS_CLOSED_DIR)
   file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
 else(LIBS_CLOSED_DIR)

indra/newview/CMakeLists.txt

@@ -2149,6 +2149,10 @@ if( TARGET media_plugin_libvlc )
   target_compile_definitions(${VIEWER_BINARY_NAME} PRIVATE USE_VLC=1)
 endif()
 
+if(BUILD_EXPIREY)
+  target_compile_definitions(${VIEWER_BINARY_NAME} PRIVATE BUILD_EXPIREY=1)
+endif()
+
 if(USE_NFD)
   target_link_libraries(${VIEWER_BINARY_NAME} PUBLIC nfd )
 endif()

indra/newview/llversioninfo.cpp

@@ -185,6 +185,7 @@ std::string LLVersionInfo::getReleaseNotes()
 
 bool LLVersionInfo::isViewerExpired()
 {
+#ifdef BUILD_EXPIREY
 	static const U64 BUILD_TIME(UNIX_TIMESTAMP);
 	static const U64Seconds TEST_EXPIREY(BUILD_TIME + ((60 * 60) * 24 * 14)); // 14 days
 	static const U64Seconds PROJECT_EXPIREY(BUILD_TIME + ((60 * 60) * 24 * 30)); // 30 days
@@ -210,5 +211,7 @@ bool LLVersionInfo::isViewerExpired()
 		break;
 	}
 	}
+#endif
 	return false;
+
 }