From c73a5b51ea40c484159dbdbd9a88c7dfcb8d6549 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 5 May 2015 14:14:35 +0200 Subject: [PATCH] Fix merge error. --- indra/newview/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index fc79e497d7..c174900347 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2565,7 +2565,7 @@ if (PACKAGE) set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest) endif (LINUX) - if( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) ) + if( RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING ) if(CMAKE_CFG_INTDIR STREQUAL ".") set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE}) else(CMAKE_CFG_INTDIR STREQUAL ".")