diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 337d005be..16b3a10d0 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 5; +const S32 LL_VERSION_PATCH = 6; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Singularity"; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9a7ecf5c2..894a80a20 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -274,6 +274,7 @@ class WindowsManifest(ViewerManifest): try: if self.prefix("../../libraries/i686-win32/lib/release/msvcrt", dst=""): self.path("*.dll") + self.path("*.manifest") self.end_prefix() except: pass