aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llappviewer.cpp2
-rw-r--r--linden/indra/newview/lldrawpoolbump.cpp2
-rw-r--r--linden/indra/newview/res/viewerRes.rc576
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/alerts.xml20
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml51
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_groups.xml78
6 files changed, 357 insertions, 372 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 7262759..5fd5575 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -308,7 +308,7 @@ const char *VFS_INDEX_FILE_BASE = "index.db2.x.";
308static std::string gSecondLife; 308static std::string gSecondLife;
309static std::string gWindowTitle; 309static std::string gWindowTitle;
310#ifdef LL_WINDOWS 310#ifdef LL_WINDOWS
311 static char sWindowClass[] = IMP_VIEWER_NAME; 311 static char sWindowClass[] = "Imprudence";
312#endif 312#endif
313 313
314std::string gLoginPage; 314std::string gLoginPage;
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 0dd11d6..73d88f7 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -139,7 +139,7 @@ void LLStandardBumpmap::restoreGL()
139 return; 139 return;
140 } 140 }
141 141
142// llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl; 142 llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
143 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label; 143 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
144 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = 144 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage =
145 gImageList.getImageFromFile(bump_file, 145 gImageList.getImageFromFile(bump_file,
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 2082405..002830a 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -1,288 +1,288 @@
1// Microsoft Visual C++ generated resource script. 1// Microsoft Visual C++ generated resource script.
2// 2//
3#include "resource.h" 3#include "resource.h"
4 4
5#ifdef IDC_STATIC 5#ifdef IDC_STATIC
6#undef IDC_STATIC 6#undef IDC_STATIC
7#endif 7#endif
8#define IDC_STATIC (-1) 8#define IDC_STATIC (-1)
9#include "winresrc.h" 9#include "winresrc.h"
10 10
11#define APSTUDIO_READONLY_SYMBOLS 11#define APSTUDIO_READONLY_SYMBOLS
12///////////////////////////////////////////////////////////////////////////// 12/////////////////////////////////////////////////////////////////////////////
13// 13//
14// Generated from the TEXTINCLUDE 2 resource. 14// Generated from the TEXTINCLUDE 2 resource.
15// 15//
16// Commented out because it only compiles if you have MFC installed. 16// Commented out because it only compiles if you have MFC installed.
17//#include "winres.h" 17//#include "winres.h"
18 18
19///////////////////////////////////////////////////////////////////////////// 19/////////////////////////////////////////////////////////////////////////////
20#undef APSTUDIO_READONLY_SYMBOLS 20#undef APSTUDIO_READONLY_SYMBOLS
21 21
22///////////////////////////////////////////////////////////////////////////// 22/////////////////////////////////////////////////////////////////////////////
23// English (U.S.) resources 23// English (U.S.) resources
24 24
25#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) 25#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
26#ifdef _WIN32 26#ifdef _WIN32
27LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 27LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
28#pragma code_page(1252) 28#pragma code_page(1252)
29#endif //_WIN32 29#endif //_WIN32
30 30
31#ifdef APSTUDIO_INVOKED 31#ifdef APSTUDIO_INVOKED
32///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33// 33//
34// TEXTINCLUDE 34// TEXTINCLUDE
35// 35//
36 36
371 TEXTINCLUDE 371 TEXTINCLUDE
38BEGIN 38BEGIN
39 "resource.h\0" 39 "resource.h\0"
40END 40END
41 41
422 TEXTINCLUDE 422 TEXTINCLUDE
43BEGIN 43BEGIN
44 "#include ""winres.h""\r\n" 44 "#include ""winres.h""\r\n"
45 "\0" 45 "\0"
46END 46END
47 47
483 TEXTINCLUDE 483 TEXTINCLUDE
49BEGIN 49BEGIN
50 "\r\n" 50 "\r\n"
51 "\0" 51 "\0"
52END 52END
53 53
54#endif // APSTUDIO_INVOKED 54#endif // APSTUDIO_INVOKED
55 55
56 56
57///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58// 58//
59// Icon 59// Icon
60// 60//
61 61
62// Icon with lowest ID value placed first to ensure application icon 62// Icon with lowest ID value placed first to ensure application icon
63// remains consistent on all systems. 63// remains consistent on all systems.
64IDI_LL_ICON ICON "ll_icon.ico" 64IDI_LL_ICON ICON "ll_icon.ico"
65IDI_INSTALL_ICON ICON "install_icon.ico" 65IDI_INSTALL_ICON ICON "install_icon.ico"
66IDI_LCD_LL_ICON ICON "icon1.ico" 66IDI_LCD_LL_ICON ICON "icon1.ico"
67 67
68///////////////////////////////////////////////////////////////////////////// 68/////////////////////////////////////////////////////////////////////////////
69// 69//
70// Dialog 70// Dialog
71// 71//
72 72
73CONNECTBOX DIALOGEX 32, 32, 187, 246 73CONNECTBOX DIALOGEX 32, 32, 187, 246
74STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 74STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
75 WS_VISIBLE | WS_CAPTION | WS_SYSMENU 75 WS_VISIBLE | WS_CAPTION | WS_SYSMENU
76FONT 8, "MS Sans Serif", 0, 0, 0x0 76FONT 8, "MS Sans Serif", 0, 0, 0x0
77BEGIN 77BEGIN
78 CONTROL 149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246 78 CONTROL 149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246
79 EDITTEXT IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL 79 EDITTEXT IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL
80 EDITTEXT IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL 80 EDITTEXT IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL
81 EDITTEXT IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD | 81 EDITTEXT IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD |
82 ES_AUTOHSCROLL 82 ES_AUTOHSCROLL
83 CONTROL "Remember password",IDC_REMEMBER_PASSWORD,"Button", 83 CONTROL "Remember password",IDC_REMEMBER_PASSWORD,"Button",
84 BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10 84 BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10
85 DEFPUSHBUTTON "Connect...",IDOK,98,210,80,13 85 DEFPUSHBUTTON "Connect...",IDOK,98,210,80,13
86 CONTROL "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX | 86 CONTROL "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX |
87 WS_TABSTOP,100,229,50,10 87 WS_TABSTOP,100,229,50,10
88 COMBOBOX IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT | 88 COMBOBOX IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT |
89 WS_VSCROLL | WS_TABSTOP 89 WS_VSCROLL | WS_TABSTOP
90END 90END
91 91
92CONNECTBOXIP DIALOG 32, 32, 282, 174 92CONNECTBOXIP DIALOG 32, 32, 282, 174
93STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | 93STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP |
94 WS_VISIBLE 94 WS_VISIBLE
95FONT 8, "MS Sans Serif" 95FONT 8, "MS Sans Serif"
96BEGIN 96BEGIN
97 LTEXT "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT 97 LTEXT "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT
98 WS_GROUP 98 WS_GROUP
99 EDITTEXT IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL 99 EDITTEXT IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL
100 LTEXT "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT 100 LTEXT "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT
101 WS_GROUP 101 WS_GROUP
102 EDITTEXT IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL 102 EDITTEXT IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL
103 LTEXT "Password:",IDC_STATIC_PASSWORD,152,55,38,10 103 LTEXT "Password:",IDC_STATIC_PASSWORD,152,55,38,10
104 EDITTEXT IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD | 104 EDITTEXT IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD |
105 ES_AUTOHSCROLL 105 ES_AUTOHSCROLL
106 CONTROL "Remember password for next time",IDC_REMEMBER_PASSWORD, 106 CONTROL "Remember password for next time",IDC_REMEMBER_PASSWORD,
107 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10 107 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10
108 LTEXT "Return to:",IDC_STATIC,152,97,32,8 108 LTEXT "Return to:",IDC_STATIC,152,97,32,8
109 CONTROL "Last location",IDC_RADIO_LAST,"Button", 109 CONTROL "Last location",IDC_RADIO_LAST,"Button",
110 BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10 110 BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10
111 CONTROL "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON | 111 CONTROL "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON |
112 WS_TABSTOP,218,109,35,10 112 WS_TABSTOP,218,109,35,10
113 LTEXT "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP 113 LTEXT "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP
114 COMBOBOX IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL | 114 COMBOBOX IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL |
115 WS_TABSTOP 115 WS_TABSTOP
116 PUSHBUTTON "Quit",IDCANCEL,152,152,50,14 116 PUSHBUTTON "Quit",IDCANCEL,152,152,50,14
117 DEFPUSHBUTTON "Connect...",IDOK,225,152,50,14 117 DEFPUSHBUTTON "Connect...",IDOK,225,152,50,14
118 CONTROL 140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157 118 CONTROL 140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157
119 LTEXT "Connect to Second Life",IDC_STATIC,152,7,78,8 119 LTEXT "Connect to Second Life",IDC_STATIC,152,7,78,8
120END 120END
121 121
122SPLASHSCREEN DIALOG 32, 32, 144, 34 122SPLASHSCREEN DIALOG 32, 32, 144, 34
123STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE 123STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
124FONT 8, "MS Sans Serif" 124FONT 8, "MS Sans Serif"
125BEGIN 125BEGIN
126 ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 126 ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
127 LTEXT "Loading Second Life...",666,36,13,91,8 127 LTEXT "Loading Second Life...",666,36,13,91,8
128END 128END
129 129
130 130
131///////////////////////////////////////////////////////////////////////////// 131/////////////////////////////////////////////////////////////////////////////
132// 132//
133// DESIGNINFO 133// DESIGNINFO
134// 134//
135 135
136#ifdef APSTUDIO_INVOKED 136#ifdef APSTUDIO_INVOKED
137GUIDELINES DESIGNINFO 137GUIDELINES DESIGNINFO
138BEGIN 138BEGIN
139 "CONNECTBOX", DIALOG 139 "CONNECTBOX", DIALOG
140 BEGIN 140 BEGIN
141 LEFTMARGIN, 8 141 LEFTMARGIN, 8
142 RIGHTMARGIN, 180 142 RIGHTMARGIN, 180
143 VERTGUIDE, 152 143 VERTGUIDE, 152
144 TOPMARGIN, 7 144 TOPMARGIN, 7
145 BOTTOMMARGIN, 239 145 BOTTOMMARGIN, 239
146 HORZGUIDE, 44 146 HORZGUIDE, 44
147 HORZGUIDE, 57 147 HORZGUIDE, 57
148 HORZGUIDE, 123 148 HORZGUIDE, 123
149 END 149 END
150 150
151 "CONNECTBOXIP", DIALOG 151 "CONNECTBOXIP", DIALOG
152 BEGIN 152 BEGIN
153 LEFTMARGIN, 7 153 LEFTMARGIN, 7
154 RIGHTMARGIN, 275 154 RIGHTMARGIN, 275
155 VERTGUIDE, 152 155 VERTGUIDE, 152
156 VERTGUIDE, 218 156 VERTGUIDE, 218
157 TOPMARGIN, 7 157 TOPMARGIN, 7
158 BOTTOMMARGIN, 166 158 BOTTOMMARGIN, 166
159 HORZGUIDE, 12 159 HORZGUIDE, 12
160 HORZGUIDE, 17 160 HORZGUIDE, 17
161 HORZGUIDE, 24 161 HORZGUIDE, 24
162 HORZGUIDE, 50 162 HORZGUIDE, 50
163 HORZGUIDE, 55 163 HORZGUIDE, 55
164 HORZGUIDE, 84 164 HORZGUIDE, 84
165 HORZGUIDE, 105 165 HORZGUIDE, 105
166 HORZGUIDE, 119 166 HORZGUIDE, 119
167 END 167 END
168 168
169 "SPLASHSCREEN", DIALOG 169 "SPLASHSCREEN", DIALOG
170 BEGIN 170 BEGIN
171 LEFTMARGIN, 7 171 LEFTMARGIN, 7
172 RIGHTMARGIN, 137 172 RIGHTMARGIN, 137
173 VERTGUIDE, 36 173 VERTGUIDE, 36
174 TOPMARGIN, 7 174 TOPMARGIN, 7
175 BOTTOMMARGIN, 27 175 BOTTOMMARGIN, 27
176 END 176 END
177END 177END
178#endif // APSTUDIO_INVOKED 178#endif // APSTUDIO_INVOKED
179 179
180 180
181///////////////////////////////////////////////////////////////////////////// 181/////////////////////////////////////////////////////////////////////////////
182// 182//
183// Menu 183// Menu
184// 184//
185 185
186IDR_MENU1 MENU 186IDR_MENU1 MENU
187BEGIN 187BEGIN
188 POPUP "testmenu" 188 POPUP "testmenu"
189 BEGIN 189 BEGIN
190 MENUITEM "test", ID_TESTMENU_TEST 190 MENUITEM "test", ID_TESTMENU_TEST
191 END 191 END
192END 192END
193 193
194 194
195///////////////////////////////////////////////////////////////////////////// 195/////////////////////////////////////////////////////////////////////////////
196// 196//
197// Cursor 197// Cursor
198// 198//
199 199
200TOOLGRAB CURSOR "lltoolgrab.cur" 200TOOLGRAB CURSOR "lltoolgrab.cur"
201TOOLLAND CURSOR "lltoolland.cur" 201TOOLLAND CURSOR "lltoolland.cur"
202TOOLZOOMIN CURSOR "lltoolzoomin.cur" 202TOOLZOOMIN CURSOR "lltoolzoomin.cur"
203TOOLCREATE CURSOR "lltoolcreate.cur" 203TOOLCREATE CURSOR "lltoolcreate.cur"
204ARROWDRAG CURSOR "llarrowdrag.cur" 204ARROWDRAG CURSOR "llarrowdrag.cur"
205ARROW CURSOR "llarrow.cur" 205ARROW CURSOR "llarrow.cur"
206NOLOCKED CURSOR "llnolocked.cur" 206NOLOCKED CURSOR "llnolocked.cur"
207ARROWLOCKED CURSOR "llarrowlocked.cur" 207ARROWLOCKED CURSOR "llarrowlocked.cur"
208GRABLOCKED CURSOR "llgrablocked.cur" 208GRABLOCKED CURSOR "llgrablocked.cur"
209TOOLROTATE CURSOR "lltoolrotate.cur" 209TOOLROTATE CURSOR "lltoolrotate.cur"
210TOOLTRANSLATE CURSOR "lltooltranslate.cur" 210TOOLTRANSLATE CURSOR "lltooltranslate.cur"
211TOOLSCALE CURSOR "lltoolscale.cur" 211TOOLSCALE CURSOR "lltoolscale.cur"
212TOOLCAMERA CURSOR "lltoolcamera.cur" 212TOOLCAMERA CURSOR "lltoolcamera.cur"
213TOOLPAN CURSOR "lltoolpan.cur" 213TOOLPAN CURSOR "lltoolpan.cur"
214TOOLFOCUS CURSOR "lltoolfocus.cur" 214TOOLFOCUS CURSOR "lltoolfocus.cur"
215TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur" 215TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
216ARROWCOPY CURSOR "arrowcop.cur" 216ARROWCOPY CURSOR "arrowcop.cur"
217ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur" 217ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
218ARROWCOPYMULTI CURSOR "arrowcopmulti.cur" 218ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
219TOOLSIT CURSOR "toolsit.cur" 219TOOLSIT CURSOR "toolsit.cur"
220TOOLBUY CURSOR "toolbuy.cur" 220TOOLBUY CURSOR "toolbuy.cur"
221TOOLPAY CURSOR "toolpay.cur" 221TOOLPAY CURSOR "toolpay.cur"
222TOOLOPEN CURSOR "toolopen.cur" 222TOOLOPEN CURSOR "toolopen.cur"
223TOOLPIPETTE CURSOR "toolpipette.cur" 223TOOLPIPETTE CURSOR "toolpipette.cur"
224TOOLPLAY CURSOR "toolplay.cur" 224TOOLPLAY CURSOR "toolplay.cur"
225TOOLPAUSE CURSOR "toolpause.cur" 225TOOLPAUSE CURSOR "toolpause.cur"
226TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" 226TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
227 227
228///////////////////////////////////////////////////////////////////////////// 228/////////////////////////////////////////////////////////////////////////////
229// 229//
230// Version 230// Version
231// 231//
232 232
233VS_VERSION_INFO VERSIONINFO 233VS_VERSION_INFO VERSIONINFO
234 FILEVERSION 1,20,9,87416 234 FILEVERSION 1,20,9,87416
235 PRODUCTVERSION 1,20,9,87416 235 PRODUCTVERSION 1,20,9,87416
236 FILEFLAGSMASK 0x3fL 236 FILEFLAGSMASK 0x3fL
237#ifdef _DEBUG 237#ifdef _DEBUG
238 FILEFLAGS 0x1L 238 FILEFLAGS 0x1L
239#else 239#else
240 FILEFLAGS 0x0L 240 FILEFLAGS 0x0L
241#endif 241#endif
242 FILEOS 0x40004L 242 FILEOS 0x40004L
243 FILETYPE 0x1L 243 FILETYPE 0x1L
244 FILESUBTYPE 0x0L 244 FILESUBTYPE 0x0L
245BEGIN 245BEGIN
246 BLOCK "StringFileInfo" 246 BLOCK "StringFileInfo"
247 BEGIN 247 BEGIN
248 BLOCK "040904b0" 248 BLOCK "040904b0"
249 BEGIN 249 BEGIN
250 VALUE "CompanyName", "Imprudence Viewer Project" 250 VALUE "CompanyName", "Imprudence Viewer Project"
251 VALUE "FileDescription", "Imprudence" 251 VALUE "FileDescription", "Imprudence"
252 VALUE "FileVersion", "1.0.0" 252 VALUE "FileVersion", "1.0.0"
253 VALUE "InternalName", "Imprudence" 253 VALUE "InternalName", "Imprudence"
254 VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." 254 VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
255 VALUE "OriginalFilename", "Imprudence.exe" 255 VALUE "OriginalFilename", "Imprudence.exe"
256 VALUE "ProductName", "Imprudence" 256 VALUE "ProductName", "Imprudence"
257 VALUE "ProductVersion", "1.0.0" 257 VALUE "ProductVersion", "1.0.0"
258 END 258 END
259 END 259 END
260 BLOCK "VarFileInfo" 260 BLOCK "VarFileInfo"
261 BEGIN 261 BEGIN
262 VALUE "Translation", 0x409, 1200 262 VALUE "Translation", 0x409, 1200
263 END 263 END
264END 264END
265 265
266 266
267///////////////////////////////////////////////////////////////////////////// 267/////////////////////////////////////////////////////////////////////////////
268// 268//
269// Bitmap 269// Bitmap
270// 270//
271 271
272IDB_BITMAP2 BITMAP "bitmap2.bmp" 272IDB_BITMAP2 BITMAP "bitmap2.bmp"
273IDB_LOGIN BITMAP "loginbackground.bmp" 273IDB_LOGIN BITMAP "loginbackground.bmp"
274#endif // English (U.S.) resources 274#endif // English (U.S.) resources
275///////////////////////////////////////////////////////////////////////////// 275/////////////////////////////////////////////////////////////////////////////
276 276
277 277
278 278
279#ifndef APSTUDIO_INVOKED 279#ifndef APSTUDIO_INVOKED
280///////////////////////////////////////////////////////////////////////////// 280/////////////////////////////////////////////////////////////////////////////
281// 281//
282// Generated from the TEXTINCLUDE 3 resource. 282// Generated from the TEXTINCLUDE 3 resource.
283// 283//
284 284
285 285
286///////////////////////////////////////////////////////////////////////////// 286/////////////////////////////////////////////////////////////////////////////
287#endif // not APSTUDIO_INVOKED 287#endif // not APSTUDIO_INVOKED
288 288
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 8bbdc3d..c2d4301 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -2957,9 +2957,9 @@ Download to your Applications folder?
2957 Cancel 2957 Cancel
2958 </option> 2958 </option>
2959 </alert> 2959 </alert>
2960 <alert modal="true" name="WebLaunchSupportWiki"> 2960 <alert modal="true" name="WebLaunchImprudenceBlog">
2961 <message name="message"> 2961 <message name="message">
2962 Go to the Official Linden Blog, for the Latest News and Information. 2962 Go to the Official Imprudence Blog, for the Latest News and Information.
2963 </message> 2963 </message>
2964 <ignore name="ignore"> 2964 <ignore name="ignore">
2965 When launching web browser to view the blog 2965 When launching web browser to view the blog
@@ -2971,6 +2971,20 @@ Download to your Applications folder?
2971 Cancel 2971 Cancel
2972 </option> 2972 </option>
2973 </alert> 2973 </alert>
2974 <alert modal="true" name="WebLaunchImprudenceForums">
2975 <message name="message">
2976 Go to the Official Imprudence Forums to discuss the Imprudence Project.
2977 </message>
2978 <ignore name="ignore">
2979 When launching web browser to view the forums
2980 </ignore>
2981 <option name="Gotopage">
2982 OK
2983 </option>
2984 <option name="Cancel">
2985 Cancel
2986 </option>
2987 </alert>
2974 <alert modal="true" name="WebLaunchLSLGuide"> 2988 <alert modal="true" name="WebLaunchLSLGuide">
2975 <message name="message"> 2989 <message name="message">
2976 Go to the Scripting Guide for scripting help? 2990 Go to the Scripting Guide for scripting help?
@@ -4225,7 +4239,7 @@ will only work if a script is added with a money() event.
4225 </alert> 4239 </alert>
4226 <alert modal="true" name="ClickOpenF1Help"> 4240 <alert modal="true" name="ClickOpenF1Help">
4227 <message name="message"> 4241 <message name="message">
4228 Visit the Second Life Support Web site? 4242 Visit the Second Life Support Web site? (note: this is not an Imprudence Help site)
4229 </message> 4243 </message>
4230 <ignore name="ignore"> 4244 <ignore name="ignore">
4231 When visiting the Second Life Support Website. 4245 When visiting the Second Life Support Website.
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index f82f254..71044a0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -764,7 +764,7 @@
764 764
765 <menu name="Help" create_jump_keys="true" label="Help" 765 <menu name="Help" create_jump_keys="true" label="Help"
766 opaque="true" tear_off="true"> 766 opaque="true" tear_off="true">
767 <menu_item_call name="Second Life Help" label="Second Life Help" 767 <menu_item_call name="Viewer Help" label="Viewer Help"
768 shortcut="F1"> 768 shortcut="F1">
769 <on_click function="ShowFloater" userdata="help f1" /> 769 <on_click function="ShowFloater" userdata="help f1" />
770 </menu_item_call> 770 </menu_item_call>
@@ -772,10 +772,15 @@
772 <on_click function="ShowFloater" userdata="help tutorial" /> 772 <on_click function="ShowFloater" userdata="help tutorial" />
773 </menu_item_call> 773 </menu_item_call>
774 <menu_item_separator /> 774 <menu_item_separator />
775 <menu_item_call name="Official Linden Blog..." 775 <menu_item_call name="Imprudence Blog..."
776 label="Official Linden Blog..."> 776 label="Imprudence Blog...">
777 <on_click function="PromptShowURL" 777 <on_click function="PromptShowURL"
778 userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" /> 778 userdata="WebLaunchImprudenceBlog,http://www.imprudenceviewer.org/" />
779 </menu_item_call>
780 <menu_item_call name="Imprudence Forums..."
781 label="Imprudence Forums...">
782 <on_click function="PromptShowURL"
783 userdata="WebLaunchImprudenceForums,http://www.imprudenceviewer.org/forums/" />
779 </menu_item_call> 784 </menu_item_call>
780 <menu_item_separator /> 785 <menu_item_separator />
781 <menu_item_call name="Scripting Guide..." 786 <menu_item_call name="Scripting Guide..."
@@ -801,42 +806,8 @@
801 <on_click function="ShowFloater" userdata="lag meter" /> 806 <on_click function="ShowFloater" userdata="lag meter" />
802 </menu_item_call> 807 </menu_item_call>
803 <menu_item_separator /> 808 <menu_item_separator />
804 <menu name="Bug Reporting" create_jump_keys="true" 809 <menu_item_call name="About Imprudence..."
805 label="Bug Reporting" opaque="true" tear_off="true"> 810 label="About Imprudence...">
806 <menu_item_call name="Public Issue Tracker..."
807 label="Public Issue Tracker...">
808 <on_click function="PromptShowURL"
809 userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
810 </menu_item_call>
811 <menu_item_call name="Publc Issue Tracker Help..."
812 label="Public Issue Tracker Help...">
813 <on_click function="PromptShowURL"
814 userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
815 </menu_item_call>
816 <menu_item_separator />
817 <menu_item_call name="Bug Reporing 101..."
818 label="Bug Reporting 101...">
819 <on_click function="PromptShowURL"
820 userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
821 </menu_item_call>
822 <menu_item_call name="Security Issues..."
823 label="Security Issues...">
824 <on_click function="PromptShowURL"
825 userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
826 </menu_item_call>
827 <menu_item_call name="QA Wiki..." label="QA Wiki...">
828 <on_click function="PromptShowURL"
829 userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
830 </menu_item_call>
831 <menu_item_separator />
832 <menu_item_call name="Report Bug..." label="Report Bug...">
833 <on_click function="PromptShowURL"
834 userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
835 </menu_item_call>
836 </menu>
837 <menu_item_separator />
838 <menu_item_call name="About Second Life..."
839 label="About Second Life...">
840 <on_click function="ShowFloater" userdata="about" /> 811 <on_click function="ShowFloater" userdata="about" />
841 </menu_item_call> 812 </menu_item_call>
842 </menu> 813 </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 02d5504..6fa099e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -1,39 +1,39 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true" 2<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
3 name="groups" width="350"> 3 name="groups" width="350">
4 <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true" 4 <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
5 draw_heading="false" draw_stripes="true" enabled="true" 5 draw_heading="false" draw_stripes="true" enabled="true"
6 follows="left|top|right|bottom" left="10" mouse_opaque="true" 6 follows="left|top|right|bottom" left="10" mouse_opaque="true"
7 multi_select="false" name="group list" tab_stop="true" top="-10" 7 multi_select="false" name="group list" tab_stop="true" top="-10"
8 width="240"> 8 width="240">
9 <column label="" name="name" width="248" /> 9 <column label="" name="name" width="248" />
10 </scroll_list> 10 </scroll_list>
11 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 11 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
12 bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom" 12 bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
13 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12" 13 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
14 mouse_opaque="false" name="groupdesc" v_pad="0" width="248"> 14 mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
15 Your currently active group is displayed in bold. 15 Your currently active group is displayed in bold.
16 </text> 16 </text>
17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom" 18 bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
19 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12" 19 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
20 mouse_opaque="false" name="groupcount" v_pad="0" width="248"> 20 mouse_opaque="false" name="groupcount" v_pad="0" width="248">
21 You belong to [COUNT] groups (of [MAX] maximum). 21 You belong to [COUNT] groups (of [MAX] maximum).
22 </text> 22 </text>
23 <pad bottom="-7" height="0" left="-90" width="1" /> 23 <pad bottom="-7" height="0" left="-90" width="1" />
24 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 24 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
25 label="IM/Call" left_delta="0" name="IM" 25 label="IM/Call" left_delta="0" name="IM"
26 tool_tip="Open Instant Message session" width="80" /> 26 tool_tip="Open Instant Message session" width="80" />
27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
28 label="Info" name="Info" width="80" /> 28 label="Info" name="Info" width="80" />
29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
30 label="Activate" name="Activate" width="80" /> 30 label="Activate" name="Activate" width="80" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
32 label="Leave" name="Leave" width="80" /> 32 label="Leave" name="Leave" width="80" />
33 <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22" 33 <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
34 label="Create..." name="Create" width="80" /> 34 label="Create..." name="Create" width="80" />
35 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 35 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
36 label="Search..." name="Search..." width="80" /> 36 label="Search..." name="Search..." width="80" />
37 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 37 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
38 label="Invite..." name="Invite..." width="80" /> 38 label="Invite..." name="Invite..." width="80" />
39</panel> 39</panel>
generated by cgit v1.1 at 2024-11-15 21:49:09 +0000