Another webkit fix, icons
This commit is contained in:
siana
BIN
indra/newview/installers/windows/install_icon_singularity.BMP
Executable file
BIN
indra/newview/installers/windows/install_icon_singularity.BMP
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 256 KiB |
BIN
indra/newview/installers/windows/uninstall_icon_singularity.BMP
Executable file
BIN
indra/newview/installers/windows/uninstall_icon_singularity.BMP
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 254 KiB |
BIN
indra/newview/installers/windows/uninstall_icon_singularity.ico
Executable file
BIN
indra/newview/installers/windows/uninstall_icon_singularity.ico
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 359 KiB |
@@ -1,193 +1,193 @@
|
||||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#ifdef IDC_STATIC
|
||||
#undef IDC_STATIC
|
||||
#endif
|
||||
#define IDC_STATIC (-1)
|
||||
#include "winresrc.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
// Commented out because it only compiles if you have MFC installed.
|
||||
//#include "winres.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE
|
||||
BEGIN
|
||||
"#include ""winres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE
|
||||
BEGIN
|
||||
"\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDI_LL_ICON ICON "snowglobe_icon.ico"
|
||||
IDI_LCD_LL_ICON ICON "icon1.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
SPLASHSCREEN DIALOG 32, 32, 144, 34
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
|
||||
LTEXT "Loading Second Life...",666,36,13,91,8
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DESIGNINFO
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO
|
||||
BEGIN
|
||||
|
||||
"SPLASHSCREEN", DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 137
|
||||
VERTGUIDE, 36
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 27
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Cursor
|
||||
//
|
||||
|
||||
TOOLGRAB CURSOR "lltoolgrab.cur"
|
||||
TOOLLAND CURSOR "lltoolland.cur"
|
||||
TOOLZOOMIN CURSOR "lltoolzoomin.cur"
|
||||
TOOLCREATE CURSOR "lltoolcreate.cur"
|
||||
ARROWDRAG CURSOR "llarrowdrag.cur"
|
||||
ARROW CURSOR "llarrow.cur"
|
||||
NOLOCKED CURSOR "llnolocked.cur"
|
||||
ARROWLOCKED CURSOR "llarrowlocked.cur"
|
||||
GRABLOCKED CURSOR "llgrablocked.cur"
|
||||
TOOLROTATE CURSOR "lltoolrotate.cur"
|
||||
TOOLTRANSLATE CURSOR "lltooltranslate.cur"
|
||||
TOOLSCALE CURSOR "lltoolscale.cur"
|
||||
TOOLCAMERA CURSOR "lltoolcamera.cur"
|
||||
TOOLPAN CURSOR "lltoolpan.cur"
|
||||
TOOLFOCUS CURSOR "lltoolfocus.cur"
|
||||
TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
|
||||
ARROWCOPY CURSOR "arrowcop.cur"
|
||||
ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
|
||||
ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
|
||||
TOOLSIT CURSOR "toolsit.cur"
|
||||
TOOLBUY CURSOR "toolbuy.cur"
|
||||
TOOLPAY CURSOR "toolpay.cur"
|
||||
TOOLOPEN CURSOR "toolopen.cur"
|
||||
TOOLPIPETTE CURSOR "toolpipette.cur"
|
||||
TOOLPLAY CURSOR "toolplay.cur"
|
||||
TOOLPAUSE CURSOR "toolpause.cur"
|
||||
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,5,0,0
|
||||
PRODUCTVERSION 1,5,0,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Siana Gears"
|
||||
VALUE "FileDescription", "Singularity Viewer"
|
||||
VALUE "FileVersion", "1.5.0.0"
|
||||
VALUE "InternalName", "Second Life"
|
||||
VALUE "LegalCopyright", "Copyright <20> 2001-2010, Linden Research, Inc."
|
||||
VALUE "OriginalFilename", "singularity.exe"
|
||||
VALUE "ProductName", "Ascent"
|
||||
VALUE "ProductVersion", "1.5.0.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Bitmap
|
||||
//
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#ifdef IDC_STATIC
|
||||
#undef IDC_STATIC
|
||||
#endif
|
||||
#define IDC_STATIC (-1)
|
||||
#include "winresrc.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
// Commented out because it only compiles if you have MFC installed.
|
||||
//#include "winres.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE
|
||||
BEGIN
|
||||
"#include ""winres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE
|
||||
BEGIN
|
||||
"\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDI_LL_ICON ICON "singularity_icon.ico"
|
||||
IDI_LCD_LL_ICON ICON "icon1.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
SPLASHSCREEN DIALOG 32, 32, 144, 34
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
|
||||
LTEXT "Loading Second Life...",666,36,13,91,8
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DESIGNINFO
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO
|
||||
BEGIN
|
||||
|
||||
"SPLASHSCREEN", DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 137
|
||||
VERTGUIDE, 36
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 27
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Cursor
|
||||
//
|
||||
|
||||
TOOLGRAB CURSOR "lltoolgrab.cur"
|
||||
TOOLLAND CURSOR "lltoolland.cur"
|
||||
TOOLZOOMIN CURSOR "lltoolzoomin.cur"
|
||||
TOOLCREATE CURSOR "lltoolcreate.cur"
|
||||
ARROWDRAG CURSOR "llarrowdrag.cur"
|
||||
ARROW CURSOR "llarrow.cur"
|
||||
NOLOCKED CURSOR "llnolocked.cur"
|
||||
ARROWLOCKED CURSOR "llarrowlocked.cur"
|
||||
GRABLOCKED CURSOR "llgrablocked.cur"
|
||||
TOOLROTATE CURSOR "lltoolrotate.cur"
|
||||
TOOLTRANSLATE CURSOR "lltooltranslate.cur"
|
||||
TOOLSCALE CURSOR "lltoolscale.cur"
|
||||
TOOLCAMERA CURSOR "lltoolcamera.cur"
|
||||
TOOLPAN CURSOR "lltoolpan.cur"
|
||||
TOOLFOCUS CURSOR "lltoolfocus.cur"
|
||||
TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
|
||||
ARROWCOPY CURSOR "arrowcop.cur"
|
||||
ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
|
||||
ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
|
||||
TOOLSIT CURSOR "toolsit.cur"
|
||||
TOOLBUY CURSOR "toolbuy.cur"
|
||||
TOOLPAY CURSOR "toolpay.cur"
|
||||
TOOLOPEN CURSOR "toolopen.cur"
|
||||
TOOLPIPETTE CURSOR "toolpipette.cur"
|
||||
TOOLPLAY CURSOR "toolplay.cur"
|
||||
TOOLPAUSE CURSOR "toolpause.cur"
|
||||
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,5,0,0
|
||||
PRODUCTVERSION 1,5,0,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Siana Gears"
|
||||
VALUE "FileDescription", "Singularity Viewer"
|
||||
VALUE "FileVersion", "1.5.0.0"
|
||||
VALUE "InternalName", "Second Life"
|
||||
VALUE "LegalCopyright", "Copyright <20> 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
|
||||
VALUE "OriginalFilename", "singularity.exe"
|
||||
VALUE "ProductName", "Singularity Viewer"
|
||||
VALUE "ProductVersion", "1.5.0.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Bitmap
|
||||
//
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
|
||||
@@ -229,6 +229,7 @@ class WindowsManifest(ViewerManifest):
|
||||
self.path("qtnetwork4.dll")
|
||||
self.path("qtopengl4.dll")
|
||||
self.path("qtwebkit4.dll")
|
||||
self.path("qtxmlpatterns4.dll")
|
||||
self.path("ssleay32.dll")
|
||||
self.end_prefix()
|
||||
|
||||
@@ -242,6 +243,13 @@ class WindowsManifest(ViewerManifest):
|
||||
self.path("qtiff4.dll")
|
||||
self.end_prefix()
|
||||
|
||||
if self.prefix(src="../../libraries/i686-win32/lib/release/codecs", dst="llplugin/codecs"):
|
||||
self.path("qcncodecs4.dll")
|
||||
self.path("qjpcodecs4.dll")
|
||||
self.path("qkrcodecs4.dll")
|
||||
self.path("qtwcodecs4.dll")
|
||||
self.end_prefix()
|
||||
|
||||
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
|
||||
self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user