diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 63bf8199c..482baa402 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,10 +35,10 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; -const char * const LL_CHANNEL = "Singularity Viewer"; +const char * const LL_CHANNEL = "Singularity"; #if LL_DARWIN const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer"; diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index b564a5375..a330de1ff 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -73,7 +73,9 @@ UninstallIcon %%SOURCE%%\installers\windows\install_icon_singularity.ico WindowIcon off ; show our icon in left corner BGGradient 9090b0 000000 notext CRCCheck on ; make sure CRC is OK -InstProgressFlags smooth colored ; new colored smooth look +#InstProgressFlags smooth colored ; new colored smooth look +InstProgressFlags +InstallColors /windows ShowInstDetails show ; no details, no "show" button SetOverwrite on ; stomp files by default AutoCloseWindow true ; after all files install, close window diff --git a/indra/newview/skins/default/textures/preview.png b/indra/newview/skins/default/textures/preview.png new file mode 100755 index 000000000..40fe64bb4 Binary files /dev/null and b/indra/newview/skins/default/textures/preview.png differ diff --git a/indra/newview/skins/silver/textures/preview.png b/indra/newview/skins/silver/textures/preview.png new file mode 100755 index 000000000..51707bb9d Binary files /dev/null and b/indra/newview/skins/silver/textures/preview.png differ