diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/bugsplat.cmake | 4 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 | 
2 files changed, 3 insertions, 3 deletions
| diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index 749ea05403..5f5cc51f63 100644 --- a/indra/cmake/bugsplat.cmake +++ b/indra/cmake/bugsplat.cmake @@ -13,8 +13,8 @@ if (USE_BUGSPLAT)                  ${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib                  )          elseif (DARWIN) -            find_library(BUGSPLAT_LIBRARIES BugsplatMac -                PATHS "${ARCH_PREBUILT_DIRS_RELEASE}") +            find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED +                NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")          else (WINDOWS)              message(FATAL_ERROR "BugSplat is not supported; add -DUSE_BUGSPLAT=OFF")          endif (WINDOWS) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ff0781991e..7cecfec1eb 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1063,7 +1063,7 @@ class DarwinManifest(ViewerManifest):                  # our apps                  executable_path = {}                  embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ] -                if bugsplat_db: +                if not bugsplat_db:                      embedded_apps.append(("mac_crash_logger", "mac-crash-logger.app"))                  for app_bld_dir, app in embedded_apps:                      self.path2basename(os.path.join(os.pardir, | 
