livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-2418 and EXT-6317 

found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
meow-7.2.2
Richard Nelson 2010-04-14 20:06:06 -07:00
parent c0a98f8f94
commit bd2b97fe40
8 changed files with 341 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llwindow/llwindowwin32.cpp
View File

@ -1544,16 +1544,16 @@ void LLWindowWin32::initCursors()
mCursor[ UI_CURSOR_TOOLZOOMIN ] = LoadCursor(module, TEXT("TOOLZOOMIN"));
mCursor[ UI_CURSOR_TOOLPICKOBJECT3 ] = LoadCursor(module, TEXT("TOOLPICKOBJECT3"));
mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE"));
mCursor[ UI_CURSOR_TOOLSIT ] = LoadCursor(module, TEXT("TOOLSIT"));
mCursor[ UI_CURSOR_TOOLBUY ] = LoadCursor(module, TEXT("TOOLBUY"));
mCursor[ UI_CURSOR_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN"));
mCursor[ UI_CURSOR_ARROW ] = LoadCursor(module, TEXT("TOOLPLAY"));
// Color cursors
gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "res", "toolbuy.cur");
mCursor[UI_CURSOR_TOOLSIT] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->findSkinnedFilename("textures", "toolsit.cur")).c_str());
mCursor[UI_CURSOR_TOOLBUY] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->findSkinnedFilename("textures", "toolbuy.cur")).c_str());
mCursor[UI_CURSOR_TOOLOPEN] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->findSkinnedFilename("textures", "toolopen.cur")).c_str());
mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
mCursor[ UI_CURSOR_TOOLPLAY ] = loadColorCursor(TEXT("TOOLPLAY"));
mCursor[ UI_CURSOR_TOOLPAUSE ] = loadColorCursor(TEXT("TOOLPAUSE"));
mCursor[ UI_CURSOR_TOOLMEDIAOPEN ] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
// Note: custom cursors that are not found make LoadCursor() return NULL.
for( S32 i = 0; i < UI_CURSOR_COUNT; i++ )

3
indra/newview/CMakeLists.txt
View File

@ -1156,6 +1156,9 @@ if (WINDOWS)
res/toolpickobject2.cur
res/toolpickobject3.cur
res/toolpipette.cur
res/toolbuy.cur
res/toolopen.cur
res/toolsit.cur
)
set_source_files_properties(${viewer_RESOURCE_FILES}

337
indra/newview/res/resource.h
View File

@ -1,185 +1,152 @@
/**
* @file resource.h
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
* Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by viewerRes.rc
//
#define IDREMOVE 3
#define IDI_LL_ICON 103
#define IDC_GRABHAND 104
#define IDC_CURSOR1 134
#define IDC_CURSOR2 136
#define IDC_CURSOR3 147
#define IDB_LOGIN 149
#define IDC_CURSOR4 153
#define IDC_CURSOR5 154
#define IDI_LCD_LL_ICON 157
#define IDC_CURSOR6 158
#define IDC_RADIO_56 1000
#define IDC_RADIO_128 1001
#define IDC_RADIO_256 1002
#define IDC_RADIO_CUSTOM 1003
#define IDC_STATIC_LAND 1004
#define IDC_EDIT_LAND 1005
#define IDC_STATIC_WATER 1006
#define IDC_EDIT_WATER 1007
#define IDC_STATIC_WIND 1008
#define IDC_EDIT_WIND 1009
#define IDC_STATIC_CLOUD 1010
#define IDC_EDIT_CLOUD 1011
#define IDC_STATIC_TASK 1012
#define IDC_EDIT_TASK 1013
#define IDC_STATIC_OTHER 1014
#define IDC_EDIT_OTHER 1015
#define IDC_EDIT_USERNAME 1018
#define IDC_EDIT_PASSWORD 1019
#define IDC_EDIT_ACCOUNT 1020
#define IDC_EDIT_GUEST 1021
#define IDC_EDIT_LASTNAME 1021
#define IDC_LABEL_TEXTURE 1028
#define IDC_BUTTON_APPLY 1030
#define IDAPPLY 1030
#define IDC_BUTTON_GRAB 1031
#define IDC_COMBO_TEXTURE 1032
#define IDC_RADIO_POSITION 1033
#define IDC_RADIO_SIZE 1034
#define IDC_RADIO_ROTATION 1035
#define IDC_STATIC_POS_X 1036
#define IDC_STATIC_POS_Y 1037
#define IDC_STATIC_POS_Z 1038
#define IDC_EDIT_POS_X 1039
#define IDC_EDIT_POS_Y 1040
#define IDC_CHECK_AUTO_LOGIN 1040
#define IDC_EDIT_POS_Z 1041
#define IDC_STATIC_FILENAME 1041
#define IDC_STATIC_POS_X2 1042
#define IDC_EDIT_FILENAME 1042
#define IDC_STATIC_POS_Y2 1043
#define IDC_COMBO_FACE 1043
#define IDC_STATIC_POS_Z2 1044
#define IDC_RADIO_TEXTURE_LOW 1044
#define IDC_COMBO_MATERIAL 1044
#define IDC_EDIT_SIZE_X 1045
#define IDC_RADIO_TEXTURE_MEDIUM 1045
#define IDC_EDIT_SIZE_Y 1046
#define IDC_RADIO_TEXTURE_HIGH 1046
#define IDC_EDIT_SIZE_Z 1047
#define IDC_STATIC_POS_X3 1048
#define IDC_STATIC_POS_Y3 1049
#define IDC_STATIC_POS_Z3 1050
#define IDC_EDIT_ROT_X 1051
#define IDC_EDIT_ROT_Y 1052
#define IDC_EDIT_ROT_Z 1053
#define IDC_CHECK_USE_PHYSICS 1065
#define IDC_LIST1 1068
#define IDC_LIST_USER 1068
#define IDC_LIST_LOCATION 1068
#define IDC_BUTTON_CHANGE 1070
#define IDC_BUTTON_CLOSE 1071
#define IDC_CHAT_SAY 1072
#define IDC_STATIC_VERT_SCALE 1073
#define IDC_STATIC_SCALE 1073
#define IDC_EDIT_VERT_SCALE 1074
#define IDC_STATIC_HORIZ_SCALE 1075
#define IDC_STATIC_SCALE2 1075
#define IDC_EDIT_HORIZ_SCALE 1076
#define IDC_BUTTON_STRETCH 1077
#define IDC_BUTTON_REPEAT 1078
#define IDC_EDIT_VERT_OFFSET 1079
#define IDC_EDIT_HORIZ_OFFSET 1080
#define IDC_EDIT_ROTATION 1081
#define IDC_STATIC_KBPS1 1082
#define IDC_STATIC_KBPS2 1083
#define IDC_BTN_INTERNAL 1083
#define IDC_BUTTON_RESET 1083
#define IDC_STATIC_KBPS3 1084
#define IDC_BTN_EXTERNAL 1084
#define IDC_STATIC_KBPS4 1085
#define IDC_BTN_QUIT 1085
#define IDC_STATIC_KBPS5 1086
#define IDC_RESOURCE_TITLE 1086
#define IDC_STATIC_KBPS6 1087
#define IDC_RESOURCE_DESC 1087
#define IDC_EDIT_SAY 1091
#define IDC_BTN_NORMAL 1092
#define IDC_BTN_WHISPER 1093
#define IDC_BTN_SHOUT 1094
#define IDC_STATIC_ACCOUNT 1102
#define IDC_STATIC_PASSWORD 1103
#define IDC_STATIC_GUEST 1104
#define IDC_STATIC_SERVER 1104
#define IDC_STATIC_SPACESERVER 1105
#define IDC_STATIC_LASTNAME 1105
#define IDC_CHECK_GUEST 1106
#define IDC_SCRIPT_EDIT 1107
#define IDC_LSLSYNTAX 1108
#define IDDONE 1109
#define IDC_LIST 1110
#define IDC_EDIT_MESSAGE 1111
#define IDC_BUTTON_REFRESH 1112
#define IDC_STATIC_OFFSET 1113
#define IDC_STATIC_ROTATION 1115
#define IDC_STATIC_FILEPATH 1115
#define IDC_STATIC_PX 1118
#define IDC_STATIC_PY 1119
#define IDC_STATIC_PZ 1120
#define IDC_STATIC_SX 1121
#define IDC_STATIC_SY 1122
#define IDC_STATIC_SZ 1123
#define IDC_STATIC_RX 1124
#define IDC_STATIC_RY 1125
#define IDC_STATIC_RZ 1126
#define IDC_BTN_APPLY 1127
#define IDC_COMBO_SERVER 1131
#define IDC_STATIC_FIRSTNAME 1132
#define IDC_EDIT_FIRSTNAME 1133
#define IDC_REMEMBER_PASSWORD 1134
#define IDC_REMEMBER_PASSWORD2 1135
#define IDC_FULL_SCREEN 1135
#define IDC_RADIO_HOME 1136
#define IDC_RADIO_LAST 1137
#define IDC_COMBO1 1138
#define IDC_COMBO_FARM 1138
#define ID_TESTMENU_TEST 40001
#define IDC_STATIC -1
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 159
#define _APS_NEXT_RESOURCE_VALUE 167
#define _APS_NEXT_COMMAND_VALUE 40002
#define _APS_NEXT_CONTROL_VALUE 1139
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by viewerRes.rc
//
#define IDREMOVE 3
#define IDI_LL_ICON 103
#define IDC_GRABHAND 104
#define IDC_CURSOR1 134
#define IDC_CURSOR2 136
#define IDC_CURSOR3 147
#define IDB_LOGIN 149
#define IDC_CURSOR4 153
#define IDC_CURSOR5 154
#define IDI_LCD_LL_ICON 157
#define IDC_CURSOR6 158
#define IDC_RADIO_56 1000
#define IDC_RADIO_128 1001
#define IDC_RADIO_256 1002
#define IDC_RADIO_CUSTOM 1003
#define IDC_STATIC_LAND 1004
#define IDC_EDIT_LAND 1005
#define IDC_STATIC_WATER 1006
#define IDC_EDIT_WATER 1007
#define IDC_STATIC_WIND 1008
#define IDC_EDIT_WIND 1009
#define IDC_STATIC_CLOUD 1010
#define IDC_EDIT_CLOUD 1011
#define IDC_STATIC_TASK 1012
#define IDC_EDIT_TASK 1013
#define IDC_STATIC_OTHER 1014
#define IDC_EDIT_OTHER 1015
#define IDC_EDIT_USERNAME 1018
#define IDC_EDIT_PASSWORD 1019
#define IDC_EDIT_ACCOUNT 1020
#define IDC_EDIT_GUEST 1021
#define IDC_EDIT_LASTNAME 1021
#define IDC_LABEL_TEXTURE 1028
#define IDC_BUTTON_APPLY 1030
#define IDAPPLY 1030
#define IDC_BUTTON_GRAB 1031
#define IDC_COMBO_TEXTURE 1032
#define IDC_RADIO_POSITION 1033
#define IDC_RADIO_SIZE 1034
#define IDC_RADIO_ROTATION 1035
#define IDC_STATIC_POS_X 1036
#define IDC_STATIC_POS_Y 1037
#define IDC_STATIC_POS_Z 1038
#define IDC_EDIT_POS_X 1039
#define IDC_EDIT_POS_Y 1040
#define IDC_CHECK_AUTO_LOGIN 1040
#define IDC_EDIT_POS_Z 1041
#define IDC_STATIC_FILENAME 1041
#define IDC_STATIC_POS_X2 1042
#define IDC_EDIT_FILENAME 1042
#define IDC_STATIC_POS_Y2 1043
#define IDC_COMBO_FACE 1043
#define IDC_STATIC_POS_Z2 1044
#define IDC_RADIO_TEXTURE_LOW 1044
#define IDC_COMBO_MATERIAL 1044
#define IDC_EDIT_SIZE_X 1045
#define IDC_RADIO_TEXTURE_MEDIUM 1045
#define IDC_EDIT_SIZE_Y 1046
#define IDC_RADIO_TEXTURE_HIGH 1046
#define IDC_EDIT_SIZE_Z 1047
#define IDC_STATIC_POS_X3 1048
#define IDC_STATIC_POS_Y3 1049
#define IDC_STATIC_POS_Z3 1050
#define IDC_EDIT_ROT_X 1051
#define IDC_EDIT_ROT_Y 1052
#define IDC_EDIT_ROT_Z 1053
#define IDC_CHECK_USE_PHYSICS 1065
#define IDC_LIST1 1068
#define IDC_LIST_USER 1068
#define IDC_LIST_LOCATION 1068
#define IDC_BUTTON_CHANGE 1070
#define IDC_BUTTON_CLOSE 1071
#define IDC_CHAT_SAY 1072
#define IDC_STATIC_VERT_SCALE 1073
#define IDC_STATIC_SCALE 1073
#define IDC_EDIT_VERT_SCALE 1074
#define IDC_STATIC_HORIZ_SCALE 1075
#define IDC_STATIC_SCALE2 1075
#define IDC_EDIT_HORIZ_SCALE 1076
#define IDC_BUTTON_STRETCH 1077
#define IDC_BUTTON_REPEAT 1078
#define IDC_EDIT_VERT_OFFSET 1079
#define IDC_EDIT_HORIZ_OFFSET 1080
#define IDC_EDIT_ROTATION 1081
#define IDC_STATIC_KBPS1 1082
#define IDC_STATIC_KBPS2 1083
#define IDC_BTN_INTERNAL 1083
#define IDC_BUTTON_RESET 1083
#define IDC_STATIC_KBPS3 1084
#define IDC_BTN_EXTERNAL 1084
#define IDC_STATIC_KBPS4 1085
#define IDC_BTN_QUIT 1085
#define IDC_STATIC_KBPS5 1086
#define IDC_RESOURCE_TITLE 1086
#define IDC_STATIC_KBPS6 1087
#define IDC_RESOURCE_DESC 1087
#define IDC_EDIT_SAY 1091
#define IDC_BTN_NORMAL 1092
#define IDC_BTN_WHISPER 1093
#define IDC_BTN_SHOUT 1094
#define IDC_STATIC_ACCOUNT 1102
#define IDC_STATIC_PASSWORD 1103
#define IDC_STATIC_GUEST 1104
#define IDC_STATIC_SERVER 1104
#define IDC_STATIC_SPACESERVER 1105
#define IDC_STATIC_LASTNAME 1105
#define IDC_CHECK_GUEST 1106
#define IDC_SCRIPT_EDIT 1107
#define IDC_LSLSYNTAX 1108
#define IDDONE 1109
#define IDC_LIST 1110
#define IDC_EDIT_MESSAGE 1111
#define IDC_BUTTON_REFRESH 1112
#define IDC_STATIC_OFFSET 1113
#define IDC_STATIC_ROTATION 1115
#define IDC_STATIC_FILEPATH 1115
#define IDC_STATIC_PX 1118
#define IDC_STATIC_PY 1119
#define IDC_STATIC_PZ 1120
#define IDC_STATIC_SX 1121
#define IDC_STATIC_SY 1122
#define IDC_STATIC_SZ 1123
#define IDC_STATIC_RX 1124
#define IDC_STATIC_RY 1125
#define IDC_STATIC_RZ 1126
#define IDC_BTN_APPLY 1127
#define IDC_COMBO_SERVER 1131
#define IDC_STATIC_FIRSTNAME 1132
#define IDC_EDIT_FIRSTNAME 1133
#define IDC_REMEMBER_PASSWORD 1134
#define IDC_REMEMBER_PASSWORD2 1135
#define IDC_FULL_SCREEN 1135
#define IDC_RADIO_HOME 1136
#define IDC_RADIO_LAST 1137
#define IDC_COMBO1 1138
#define IDC_COMBO_FARM 1138
#define ID_TESTMENU_TEST 40001
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 173
#define _APS_NEXT_COMMAND_VALUE 40002
#define _APS_NEXT_CONTROL_VALUE 1139
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

BIN
indra/newview/res/toolbuy.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
indra/newview/res/toolopen.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
indra/newview/res/toolsit.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

353
indra/newview/res/viewerRes.rc
View File

@ -1,175 +1,178 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#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 "ll_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"
TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,3422
PRODUCTVERSION 2,0,0,3422
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", "Linden Lab"
VALUE "FileDescription", "Second Life"
VALUE "FileVersion", "2.0.0.200030"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
VALUE "ProductVersion", "2.0.0.200030"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#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"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#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 "ll_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"
TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
TOOLBUY CURSOR "toolbuy.cur"
TOOLOPEN CURSOR "toolopen.cur"
TOOLSIT CURSOR "toolsit.cur"
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,3422
PRODUCTVERSION 2,0,0,3422
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", "Linden Lab"
VALUE "FileDescription", "Second Life"
VALUE "FileVersion", "2.0.0.200030"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
VALUE "ProductVersion", "2.0.0.200030"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

1
indra/newview/viewer_manifest.py
View File

@ -91,7 +91,6 @@ class ViewerManifest(LLManifest):
self.path("*.j2c")
self.path("*.jpg")
self.path("*.png")
self.path("*.cur")
self.path("textures.xml")
self.end_prefix("*/textures")
self.path("*/xui/*/*.xml")