Merge branch 'weekly' into SNOW-713

3 files changed, 16 insertions, 2 deletions

diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 3444a15..fc777b2 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -121,6 +121,9 @@ ARGUMENTS=[
          default=""),
     dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE),
     dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE),
+    dict(name='buildtype',
+         description='Set to DEBUG if this is a debug build.',
+         default="RELEASE"),
     dict(name='channel',
          description="""The channel to use for updates, packaging, settings name, etc.""",
          default=get_channel),
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 8683bae..dff759e 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1356,6 +1356,7 @@ if (WINDOWS)
           --channel=${VIEWER_CHANNEL}
           --login_channel=${VIEWER_LOGIN_CHANNEL}
           --standalone=${STANDALONE}
+          --buildtype=${CMAKE_BUILD_TYPE}
           --grid=${GRID}
           --source=${CMAKE_CURRENT_SOURCE_DIR}
               --artwork=${ARTWORK_DIR}
@@ -1434,6 +1435,7 @@ if (LINUX)
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         --standalone=${STANDALONE}
+        --buildtype=${CMAKE_BUILD_TYPE}
         --grid=${GRID}
         --channel=${VIEWER_CHANNEL}
         --login_channel=${VIEWER_LOGIN_CHANNEL}
@@ -1498,6 +1500,7 @@ if (DARWIN)
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
           --standalone=${STANDALONE}
+          --buildtype=${CMAKE_BUILD_TYPE}
           --grid=${GRID}
           --configuration=${CMAKE_CFG_INTDIR}
           --channel=${VIEWER_CHANNEL}
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 30c0271..f9c34d6 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -162,6 +162,8 @@ class ViewerManifest(LLManifest):
 
     def standalone(self):
         return self.args['standalone'] == "ON"
+    def debug(self):
+        return self.args['buildtype'] == "DEBUG"
     def grid(self):
         return self.args['grid']
     def channel(self):
@@ -990,7 +992,10 @@ class LinuxManifest(ViewerManifest):
 class Linux_i686Manifest(LinuxManifest):
     def construct(self):
         super(Linux_i686Manifest, self).construct()
-        self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
+        if self.debug():
+            self.path("imprudence-bin","bin/do-not-directly-run-imprudence-bin")
+        else:
+            self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 
         self.path("../llcommon/libllcommon.so", "lib/libllcommon.so")
 
@@ -1108,7 +1113,10 @@ class Linux_i686Manifest(LinuxManifest):
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):
         super(Linux_x86_64Manifest, self).construct()
-        self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
+        if self.debug():
+            self.path("imprudence-bin","bin/do-not-directly-run-imprudence-bin")
+        else:
+            self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 #        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
 
         self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so")