QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme

svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.

6 files changed, 0 insertions, 103 deletions

diff --git a/indra/newview/res/bitmap2.bmp b/indra/newview/res/bitmap2.bmp
deleted file mode 100644
index 770b07558c..0000000000
--- a/indra/newview/res/bitmap2.bmp
+++ /dev/null
diff --git a/indra/newview/res/install_icon.BMP b/indra/newview/res/install_icon.BMP
deleted file mode 100644
index 09df573870..0000000000
--- a/indra/newview/res/install_icon.BMP
+++ /dev/null
diff --git a/indra/newview/res/loginbackground.bmp b/indra/newview/res/loginbackground.bmp
deleted file mode 100644
index 288a0b0398..0000000000
--- a/indra/newview/res/loginbackground.bmp
+++ /dev/null
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h
index 1a1ace82ae..da27e47dfb 100644
--- a/indra/newview/res/resource.h
+++ b/indra/newview/res/resource.h
@@ -36,17 +36,9 @@
 #define IDREMOVE                        3
 #define IDI_LL_ICON                     103
 #define IDC_GRABHAND                    104
-#define IDR_MENU1                       112
-#define IDD_DIALOG1                     113
-#define IDI_INSTALL_ICON                133
 #define IDC_CURSOR1                     134
 #define IDC_CURSOR2                     136
-#define IDB_BITMAP1                     138
-#define IDB_BITMAP2                     140
-#define IDB_BITMAP3                     144
 #define IDC_CURSOR3                     147
-#define IDB_BITMAP4                     148
-#define IDB_BITMAP5                     149
 #define IDB_LOGIN                       149
 #define IDC_CURSOR4                     153
 #define IDC_CURSOR5                     154
diff --git a/indra/newview/res/uninstall_icon.BMP b/indra/newview/res/uninstall_icon.BMP
deleted file mode 100644
index 562b56676a..0000000000
--- a/indra/newview/res/uninstall_icon.BMP
+++ /dev/null
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index b360871f20..908c4e1da3 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -62,7 +62,6 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_LL_ICON             ICON                    "ll_icon.ico"
-IDI_INSTALL_ICON        ICON                    "install_icon.ico"
 IDI_LCD_LL_ICON         ICON                    "icon1.ico"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,55 +69,6 @@ IDI_LCD_LL_ICON         ICON                    "icon1.ico"
 // Dialog
 //
 
-CONNECTBOX DIALOGEX 32, 32, 187, 246
-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    CONTROL         149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246
-    EDITTEXT        IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD |
-                    ES_AUTOHSCROLL
-    CONTROL         "Remember password",IDC_REMEMBER_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10
-    DEFPUSHBUTTON   "Connect...",IDOK,98,210,80,13
-    CONTROL         "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,100,229,50,10
-    COMBOBOX        IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT |
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-CONNECTBOXIP DIALOG  32, 32, 282, 174
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP |
-    WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT
-                    WS_GROUP
-    EDITTEXT        IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL
-    LTEXT           "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT
-                    WS_GROUP
-    EDITTEXT        IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC_PASSWORD,152,55,38,10
-    EDITTEXT        IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD |
-                    ES_AUTOHSCROLL
-    CONTROL         "Remember password for next time",IDC_REMEMBER_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10
-    LTEXT           "Return to:",IDC_STATIC,152,97,32,8
-    CONTROL         "Last location",IDC_RADIO_LAST,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10
-    CONTROL         "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON |
-                    WS_TABSTOP,218,109,35,10
-    LTEXT           "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL |
-                    WS_TABSTOP
-    PUSHBUTTON      "Quit",IDCANCEL,152,152,50,14
-    DEFPUSHBUTTON   "Connect...",IDOK,225,152,50,14
-    CONTROL         140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157
-    LTEXT           "Connect to Second Life",IDC_STATIC,152,7,78,8
-END
-
 SPLASHSCREEN DIALOG  32, 32, 144, 34
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Sans Serif"
@@ -136,35 +86,6 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO
 BEGIN
-    "CONNECTBOX", DIALOG
-    BEGIN
-        LEFTMARGIN, 8
-        RIGHTMARGIN, 180
-        VERTGUIDE, 152
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 239
-        HORZGUIDE, 44
-        HORZGUIDE, 57
-        HORZGUIDE, 123
-    END
-
-    "CONNECTBOXIP", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 275
-        VERTGUIDE, 152
-        VERTGUIDE, 218
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 166
-        HORZGUIDE, 12
-        HORZGUIDE, 17
-        HORZGUIDE, 24
-        HORZGUIDE, 50
-        HORZGUIDE, 55
-        HORZGUIDE, 84
-        HORZGUIDE, 105
-        HORZGUIDE, 119
-    END
 
     "SPLASHSCREEN", DIALOG
     BEGIN
@@ -180,20 +101,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Menu
-//
-
-IDR_MENU1 MENU
-BEGIN
-    POPUP "testmenu"
-    BEGIN
-        MENUITEM "test",                        ID_TESTMENU_TEST
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Cursor
 //
 
@@ -269,8 +176,6 @@ END
 // Bitmap
 //
 
-IDB_BITMAP2             BITMAP                  "bitmap2.bmp"
-IDB_LOGIN               BITMAP                  "loginbackground.bmp"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////