diff options
Diffstat (limited to 'linden/indra/newview/skins/xui/en-us')
5 files changed, 62 insertions, 62 deletions
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml index b36a4ea..39d1728 100644 --- a/linden/indra/newview/skins/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/xui/en-us/alerts.xml | |||
@@ -4483,7 +4483,7 @@ try it out yourself by pasting it into the address bar of your web browser. | |||
4483 | </alert> | 4483 | </alert> |
4484 | <alert modal="true" name="GraphicsPreferencesHelp"> | 4484 | <alert modal="true" name="GraphicsPreferencesHelp"> |
4485 | <message name="message"> | 4485 | <message name="message"> |
4486 | This panel controls window size and resolution and the quality of the client's graphics. The graphics preferences interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. One may customize their graphics settings by checking the Custom checkbox and manipulating the following settings: | 4486 | This panel controls window size and resolution and the quality of the client's graphics. The Preferences > Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings: |
4487 | 4487 | ||
4488 | Shaders: Enable or disable various types of pixel shaders. | 4488 | Shaders: Enable or disable various types of pixel shaders. |
4489 | 4489 | ||
@@ -4497,13 +4497,11 @@ Max Particle Count: Sets the maximum number of particles you are able to see on | |||
4497 | 4497 | ||
4498 | Post Process Quality: Sets the resolution with which Glow is rendered. | 4498 | Post Process Quality: Sets the resolution with which Glow is rendered. |
4499 | 4499 | ||
4500 | Mesh Detail: Sets the amout of detail used in rendering certain objects. | 4500 | Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail. |
4501 | 4501 | ||
4502 | Lighting Detail: Selects what types of lights you would like to render. | 4502 | Lighting Detail: Selects what types of lights you would like to render. |
4503 | 4503 | ||
4504 | Terrain Detail: Sets the amount of terrain detail you would like to see. | 4504 | Terrain Detail: Sets the amount of detail you would like to see for the terrain texture. |
4505 | |||
4506 | Sky Detail: Sets the amount of tesselation of the sky dome. A higher value takes longer to render, but makes the sun look more rounded. | ||
4507 | </message> | 4505 | </message> |
4508 | </alert> | 4506 | </alert> |
4509 | <alert modal="true" name="WLSavePresetAlert"> | 4507 | <alert modal="true" name="WLSavePresetAlert"> |
diff --git a/linden/indra/newview/skins/xui/en-us/mime_types.xml b/linden/indra/newview/skins/xui/en-us/mime_types.xml index a0ac9d8..2a77a8b 100644 --- a/linden/indra/newview/skins/xui/en-us/mime_types.xml +++ b/linden/indra/newview/skins/xui/en-us/mime_types.xml | |||
@@ -10,7 +10,7 @@ | |||
10 | LLMediaImplLLMozLib | 10 | LLMediaImplLLMozLib |
11 | </defaultimpl> | 11 | </defaultimpl> |
12 | <widgetset name="web"> | 12 | <widgetset name="web"> |
13 | <label> | 13 | <label name="web_label"> |
14 | Web Content | 14 | Web Content |
15 | </label> | 15 | </label> |
16 | <icon> | 16 | <icon> |
@@ -19,10 +19,10 @@ | |||
19 | <default_type> | 19 | <default_type> |
20 | text/html | 20 | text/html |
21 | </default_type> | 21 | </default_type> |
22 | <tooltip> | 22 | <tooltip name="web_tooltip"> |
23 | This location has Web content | 23 | This location has Web content |
24 | </tooltip> | 24 | </tooltip> |
25 | <playtip> | 25 | <playtip name="web_playtip"> |
26 | Show Web content | 26 | Show Web content |
27 | </playtip> | 27 | </playtip> |
28 | <allow_resize> | 28 | <allow_resize> |
@@ -33,7 +33,7 @@ | |||
33 | </allow_looping> | 33 | </allow_looping> |
34 | </widgetset> | 34 | </widgetset> |
35 | <widgetset name="movie"> | 35 | <widgetset name="movie"> |
36 | <label> | 36 | <label name="movie_label"> |
37 | Movie | 37 | Movie |
38 | </label> | 38 | </label> |
39 | <default_type> | 39 | <default_type> |
@@ -42,10 +42,10 @@ | |||
42 | <icon> | 42 | <icon> |
43 | icn_media_movie.tga | 43 | icn_media_movie.tga |
44 | </icon> | 44 | </icon> |
45 | <tooltip> | 45 | <tooltip name="movie_tooltip"> |
46 | There is a movie to play here | 46 | There is a movie to play here |
47 | </tooltip> | 47 | </tooltip> |
48 | <playtip> | 48 | <playtip name="movie_playtip"> |
49 | Play movie | 49 | Play movie |
50 | </playtip> | 50 | </playtip> |
51 | <allow_resize> | 51 | <allow_resize> |
@@ -56,7 +56,7 @@ | |||
56 | </allow_looping> | 56 | </allow_looping> |
57 | </widgetset> | 57 | </widgetset> |
58 | <widgetset name="none"> | 58 | <widgetset name="none"> |
59 | <label> | 59 | <label name="none_label"> |
60 | No Content | 60 | No Content |
61 | </label> | 61 | </label> |
62 | <default_type> | 62 | <default_type> |
@@ -65,10 +65,10 @@ | |||
65 | <icon> | 65 | <icon> |
66 | icn_media_web.tga | 66 | icn_media_web.tga |
67 | </icon> | 67 | </icon> |
68 | <tooltip> | 68 | <tooltip name="none_tooltip"> |
69 | No media here | 69 | No media here |
70 | </tooltip> | 70 | </tooltip> |
71 | <playtip /> | 71 | <playtip name="none_playtip" /> |
72 | <allow_resize> | 72 | <allow_resize> |
73 | false | 73 | false |
74 | </allow_resize> | 74 | </allow_resize> |
@@ -77,7 +77,7 @@ | |||
77 | </allow_looping> | 77 | </allow_looping> |
78 | </widgetset> | 78 | </widgetset> |
79 | <widgetset name="image"> | 79 | <widgetset name="image"> |
80 | <label> | 80 | <label name="image_label"> |
81 | Image | 81 | Image |
82 | </label> | 82 | </label> |
83 | <icon> | 83 | <icon> |
@@ -86,10 +86,10 @@ | |||
86 | <default_type> | 86 | <default_type> |
87 | image/* | 87 | image/* |
88 | </default_type> | 88 | </default_type> |
89 | <tooltip> | 89 | <tooltip name="image_tooltip"> |
90 | There is an image at this location | 90 | There is an image at this location |
91 | </tooltip> | 91 | </tooltip> |
92 | <playtip> | 92 | <playtip name="image_playtip"> |
93 | View this location's image | 93 | View this location's image |
94 | </playtip> | 94 | </playtip> |
95 | <allow_resize> | 95 | <allow_resize> |
@@ -100,7 +100,7 @@ | |||
100 | </allow_looping> | 100 | </allow_looping> |
101 | </widgetset> | 101 | </widgetset> |
102 | <widgetset name="audio"> | 102 | <widgetset name="audio"> |
103 | <label> | 103 | <label name="audio_label"> |
104 | Audio | 104 | Audio |
105 | </label> | 105 | </label> |
106 | <icon> | 106 | <icon> |
@@ -109,11 +109,11 @@ | |||
109 | <default_type> | 109 | <default_type> |
110 | audio/* | 110 | audio/* |
111 | </default_type> | 111 | </default_type> |
112 | <tooltip> | 112 | <tooltip name="audio_tooltip"> |
113 | There is audio at this location | 113 | There is audio at this location |
114 | </tooltip> | 114 | </tooltip> |
115 | <playtip> | 115 | <playtip name="audio_playtip"> |
116 | View this location's audio | 116 | Play this location's audio |
117 | </playtip> | 117 | </playtip> |
118 | <allow_resize> | 118 | <allow_resize> |
119 | false | 119 | false |
@@ -123,7 +123,7 @@ | |||
123 | </allow_looping> | 123 | </allow_looping> |
124 | </widgetset> | 124 | </widgetset> |
125 | <scheme name="rtsp"> | 125 | <scheme name="rtsp"> |
126 | <label> | 126 | <label name="rtsp_label"> |
127 | Real Time Streaming | 127 | Real Time Streaming |
128 | </label> | 128 | </label> |
129 | <widgettype> | 129 | <widgettype> |
@@ -131,7 +131,7 @@ | |||
131 | </widgettype> | 131 | </widgettype> |
132 | </scheme> | 132 | </scheme> |
133 | <mimetype name="blank"> | 133 | <mimetype name="blank"> |
134 | <label> | 134 | <label name="blank_label"> |
135 | - None - | 135 | - None - |
136 | </label> | 136 | </label> |
137 | <widgettype> | 137 | <widgettype> |
@@ -142,7 +142,7 @@ | |||
142 | </impl> | 142 | </impl> |
143 | </mimetype> | 143 | </mimetype> |
144 | <mimetype name="none/none"> | 144 | <mimetype name="none/none"> |
145 | <label> | 145 | <label name="none/none_label"> |
146 | - None - | 146 | - None - |
147 | </label> | 147 | </label> |
148 | <widgettype> | 148 | <widgettype> |
@@ -150,7 +150,7 @@ | |||
150 | </widgettype> | 150 | </widgettype> |
151 | </mimetype> | 151 | </mimetype> |
152 | <mimetype name="audio/*"> | 152 | <mimetype name="audio/*"> |
153 | <label> | 153 | <label name="audio2_label"> |
154 | Audio | 154 | Audio |
155 | </label> | 155 | </label> |
156 | <widgettype> | 156 | <widgettype> |
@@ -158,7 +158,7 @@ | |||
158 | </widgettype> | 158 | </widgettype> |
159 | </mimetype> | 159 | </mimetype> |
160 | <mimetype name="video/*"> | 160 | <mimetype name="video/*"> |
161 | <label> | 161 | <label name="video2_label"> |
162 | Video | 162 | Video |
163 | </label> | 163 | </label> |
164 | <widgettype> | 164 | <widgettype> |
@@ -166,7 +166,7 @@ | |||
166 | </widgettype> | 166 | </widgettype> |
167 | </mimetype> | 167 | </mimetype> |
168 | <mimetype name="image/*"> | 168 | <mimetype name="image/*"> |
169 | <label> | 169 | <label label="image2_label"> |
170 | Image | 170 | Image |
171 | </label> | 171 | </label> |
172 | <widgettype> | 172 | <widgettype> |
@@ -174,7 +174,7 @@ | |||
174 | </widgettype> | 174 | </widgettype> |
175 | </mimetype> | 175 | </mimetype> |
176 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | 176 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> |
177 | <label> | 177 | <label name="vnd.secondlife.qt.legacy_label"> |
178 | Movie (QuickTime) | 178 | Movie (QuickTime) |
179 | </label> | 179 | </label> |
180 | <widgettype> | 180 | <widgettype> |
@@ -185,7 +185,7 @@ | |||
185 | </impl> | 185 | </impl> |
186 | </mimetype> | 186 | </mimetype> |
187 | <mimetype name="application/javascript"> | 187 | <mimetype name="application/javascript"> |
188 | <label> | 188 | <label name="application/javascript_label"> |
189 | Javascript | 189 | Javascript |
190 | </label> | 190 | </label> |
191 | <widgettype> | 191 | <widgettype> |
@@ -193,7 +193,7 @@ | |||
193 | </widgettype> | 193 | </widgettype> |
194 | </mimetype> | 194 | </mimetype> |
195 | <mimetype name="application/ogg"> | 195 | <mimetype name="application/ogg"> |
196 | <label> | 196 | <label name="application/ogg_label"> |
197 | Ogg Audio/Video | 197 | Ogg Audio/Video |
198 | </label> | 198 | </label> |
199 | <widgettype> | 199 | <widgettype> |
@@ -201,7 +201,7 @@ | |||
201 | </widgettype> | 201 | </widgettype> |
202 | </mimetype> | 202 | </mimetype> |
203 | <mimetype name="application/pdf"> | 203 | <mimetype name="application/pdf"> |
204 | <label> | 204 | <label name="application/pdf_label"> |
205 | PDF Document | 205 | PDF Document |
206 | </label> | 206 | </label> |
207 | <widgettype> | 207 | <widgettype> |
@@ -209,7 +209,7 @@ | |||
209 | </widgettype> | 209 | </widgettype> |
210 | </mimetype> | 210 | </mimetype> |
211 | <mimetype name="application/postscript"> | 211 | <mimetype name="application/postscript"> |
212 | <label> | 212 | <label name="application/postscript_label"> |
213 | Postscript Document | 213 | Postscript Document |
214 | </label> | 214 | </label> |
215 | <widgettype> | 215 | <widgettype> |
@@ -217,7 +217,7 @@ | |||
217 | </widgettype> | 217 | </widgettype> |
218 | </mimetype> | 218 | </mimetype> |
219 | <mimetype name="application/rtf"> | 219 | <mimetype name="application/rtf"> |
220 | <label> | 220 | <label name="application/rtf_label"> |
221 | Rich Text (RTF) | 221 | Rich Text (RTF) |
222 | </label> | 222 | </label> |
223 | <widgettype> | 223 | <widgettype> |
@@ -225,7 +225,7 @@ | |||
225 | </widgettype> | 225 | </widgettype> |
226 | </mimetype> | 226 | </mimetype> |
227 | <mimetype name="application/xhtml+xml"> | 227 | <mimetype name="application/xhtml+xml"> |
228 | <label> | 228 | <label name="application/xhtml+xml_label"> |
229 | Web Page (XHTML) | 229 | Web Page (XHTML) |
230 | </label> | 230 | </label> |
231 | <widgettype> | 231 | <widgettype> |
@@ -233,7 +233,7 @@ | |||
233 | </widgettype> | 233 | </widgettype> |
234 | </mimetype> | 234 | </mimetype> |
235 | <mimetype name="application/x-director"> | 235 | <mimetype name="application/x-director"> |
236 | <label> | 236 | <label name="application/x-director_label"> |
237 | Macromedia Director | 237 | Macromedia Director |
238 | </label> | 238 | </label> |
239 | <widgettype> | 239 | <widgettype> |
@@ -241,7 +241,7 @@ | |||
241 | </widgettype> | 241 | </widgettype> |
242 | </mimetype> | 242 | </mimetype> |
243 | <mimetype name="application/x-shockwave-flash"> | 243 | <mimetype name="application/x-shockwave-flash"> |
244 | <label> | 244 | <label name="application/x-shockwave-flash_label"> |
245 | Flash | 245 | Flash |
246 | </label> | 246 | </label> |
247 | <widgettype> | 247 | <widgettype> |
@@ -249,7 +249,7 @@ | |||
249 | </widgettype> | 249 | </widgettype> |
250 | </mimetype> | 250 | </mimetype> |
251 | <mimetype name="audio/mid"> | 251 | <mimetype name="audio/mid"> |
252 | <label> | 252 | <label name="audio/mid_label"> |
253 | Audio (MIDI) | 253 | Audio (MIDI) |
254 | </label> | 254 | </label> |
255 | <widgettype> | 255 | <widgettype> |
@@ -257,7 +257,7 @@ | |||
257 | </widgettype> | 257 | </widgettype> |
258 | </mimetype> | 258 | </mimetype> |
259 | <mimetype name="audio/mpeg"> | 259 | <mimetype name="audio/mpeg"> |
260 | <label> | 260 | <label name="audio/mpeg_label"> |
261 | Audio (MP3) | 261 | Audio (MP3) |
262 | </label> | 262 | </label> |
263 | <widgettype> | 263 | <widgettype> |
@@ -265,7 +265,7 @@ | |||
265 | </widgettype> | 265 | </widgettype> |
266 | </mimetype> | 266 | </mimetype> |
267 | <mimetype name="audio/x-aiff"> | 267 | <mimetype name="audio/x-aiff"> |
268 | <label> | 268 | <label name="audio/x-aiff_label"> |
269 | Audio (AIFF) | 269 | Audio (AIFF) |
270 | </label> | 270 | </label> |
271 | <widgettype> | 271 | <widgettype> |
@@ -273,7 +273,7 @@ | |||
273 | </widgettype> | 273 | </widgettype> |
274 | </mimetype> | 274 | </mimetype> |
275 | <mimetype name="audio/x-wav"> | 275 | <mimetype name="audio/x-wav"> |
276 | <label> | 276 | <label name="audio/x-wav_label"> |
277 | Audio (WAV) | 277 | Audio (WAV) |
278 | </label> | 278 | </label> |
279 | <widgettype> | 279 | <widgettype> |
@@ -281,7 +281,7 @@ | |||
281 | </widgettype> | 281 | </widgettype> |
282 | </mimetype> | 282 | </mimetype> |
283 | <mimetype menu="1" name="image/bmp"> | 283 | <mimetype menu="1" name="image/bmp"> |
284 | <label> | 284 | <label name="image/bmp_label"> |
285 | Image (BMP) | 285 | Image (BMP) |
286 | </label> | 286 | </label> |
287 | <widgettype> | 287 | <widgettype> |
@@ -292,7 +292,7 @@ | |||
292 | </impl> | 292 | </impl> |
293 | </mimetype> | 293 | </mimetype> |
294 | <mimetype menu="1" name="image/gif"> | 294 | <mimetype menu="1" name="image/gif"> |
295 | <label> | 295 | <label name="image/gif_label"> |
296 | Image (GIF) | 296 | Image (GIF) |
297 | </label> | 297 | </label> |
298 | <widgettype> | 298 | <widgettype> |
@@ -303,7 +303,7 @@ | |||
303 | </impl> | 303 | </impl> |
304 | </mimetype> | 304 | </mimetype> |
305 | <mimetype menu="1" name="image/jpeg"> | 305 | <mimetype menu="1" name="image/jpeg"> |
306 | <label> | 306 | <label name="image/jpeg_label"> |
307 | Image (JPEG) | 307 | Image (JPEG) |
308 | </label> | 308 | </label> |
309 | <widgettype> | 309 | <widgettype> |
@@ -314,7 +314,7 @@ | |||
314 | </impl> | 314 | </impl> |
315 | </mimetype> | 315 | </mimetype> |
316 | <mimetype menu="1" name="image/png"> | 316 | <mimetype menu="1" name="image/png"> |
317 | <label> | 317 | <label name="image/png_label"> |
318 | Image (PNG) | 318 | Image (PNG) |
319 | </label> | 319 | </label> |
320 | <widgettype> | 320 | <widgettype> |
@@ -325,7 +325,7 @@ | |||
325 | </impl> | 325 | </impl> |
326 | </mimetype> | 326 | </mimetype> |
327 | <mimetype name="image/svg+xml"> | 327 | <mimetype name="image/svg+xml"> |
328 | <label> | 328 | <label name="image/svg+xml_label"> |
329 | Image (SVG) | 329 | Image (SVG) |
330 | </label> | 330 | </label> |
331 | <widgettype> | 331 | <widgettype> |
@@ -336,7 +336,7 @@ | |||
336 | </impl> | 336 | </impl> |
337 | </mimetype> | 337 | </mimetype> |
338 | <mimetype menu="1" name="image/tiff"> | 338 | <mimetype menu="1" name="image/tiff"> |
339 | <label> | 339 | <label name="image/tiff_label"> |
340 | Image (TIFF) | 340 | Image (TIFF) |
341 | </label> | 341 | </label> |
342 | <widgettype> | 342 | <widgettype> |
@@ -347,7 +347,7 @@ | |||
347 | </impl> | 347 | </impl> |
348 | </mimetype> | 348 | </mimetype> |
349 | <mimetype menu="1" name="text/html"> | 349 | <mimetype menu="1" name="text/html"> |
350 | <label> | 350 | <label name="text/html_label"> |
351 | Web Page | 351 | Web Page |
352 | </label> | 352 | </label> |
353 | <widgettype> | 353 | <widgettype> |
@@ -358,7 +358,7 @@ | |||
358 | </impl> | 358 | </impl> |
359 | </mimetype> | 359 | </mimetype> |
360 | <mimetype menu="1" name="text/plain"> | 360 | <mimetype menu="1" name="text/plain"> |
361 | <label> | 361 | <label name="text/plain_label"> |
362 | Text | 362 | Text |
363 | </label> | 363 | </label> |
364 | <widgettype> | 364 | <widgettype> |
@@ -369,7 +369,7 @@ | |||
369 | </impl> | 369 | </impl> |
370 | </mimetype> | 370 | </mimetype> |
371 | <mimetype name="text/xml"> | 371 | <mimetype name="text/xml"> |
372 | <label> | 372 | <label name="text/xml_label"> |
373 | XML | 373 | XML |
374 | </label> | 374 | </label> |
375 | <widgettype> | 375 | <widgettype> |
@@ -380,7 +380,7 @@ | |||
380 | </impl> | 380 | </impl> |
381 | </mimetype> | 381 | </mimetype> |
382 | <mimetype menu="1" name="video/mpeg"> | 382 | <mimetype menu="1" name="video/mpeg"> |
383 | <label> | 383 | <label name="video/mpeg_label"> |
384 | Movie (MPEG) | 384 | Movie (MPEG) |
385 | </label> | 385 | </label> |
386 | <widgettype> | 386 | <widgettype> |
@@ -391,7 +391,7 @@ | |||
391 | </impl> | 391 | </impl> |
392 | </mimetype> | 392 | </mimetype> |
393 | <mimetype name="video/mp4"> | 393 | <mimetype name="video/mp4"> |
394 | <label> | 394 | <label name="video/mp4_label"> |
395 | Movie (MP4) | 395 | Movie (MP4) |
396 | </label> | 396 | </label> |
397 | <widgettype> | 397 | <widgettype> |
@@ -402,7 +402,7 @@ | |||
402 | </impl> | 402 | </impl> |
403 | </mimetype> | 403 | </mimetype> |
404 | <mimetype menu="1" name="video/quicktime"> | 404 | <mimetype menu="1" name="video/quicktime"> |
405 | <label> | 405 | <label name="video/quicktime_label"> |
406 | Movie (QuickTime) | 406 | Movie (QuickTime) |
407 | </label> | 407 | </label> |
408 | <widgettype> | 408 | <widgettype> |
@@ -413,7 +413,7 @@ | |||
413 | </impl> | 413 | </impl> |
414 | </mimetype> | 414 | </mimetype> |
415 | <mimetype name="video/x-ms-asf"> | 415 | <mimetype name="video/x-ms-asf"> |
416 | <label> | 416 | <label name="video/x-ms-asf_label"> |
417 | Movie (Windows Media ASF) | 417 | Movie (Windows Media ASF) |
418 | </label> | 418 | </label> |
419 | <widgettype> | 419 | <widgettype> |
@@ -424,7 +424,7 @@ | |||
424 | </impl> | 424 | </impl> |
425 | </mimetype> | 425 | </mimetype> |
426 | <mimetype name="video/x-ms-wmv"> | 426 | <mimetype name="video/x-ms-wmv"> |
427 | <label> | 427 | <label name="video/x-ms-wmv_label"> |
428 | Movie (Windows Media WMV) | 428 | Movie (Windows Media WMV) |
429 | </label> | 429 | </label> |
430 | <widgettype> | 430 | <widgettype> |
@@ -435,7 +435,7 @@ | |||
435 | </impl> | 435 | </impl> |
436 | </mimetype> | 436 | </mimetype> |
437 | <mimetype menu="1" name="video/x-msvideo"> | 437 | <mimetype menu="1" name="video/x-msvideo"> |
438 | <label> | 438 | <label name="video/x-msvideo_label"> |
439 | Movie (AVI) | 439 | Movie (AVI) |
440 | </label> | 440 | </label> |
441 | <widgettype> | 441 | <widgettype> |
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml index bea5dc4..53f847a 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml | |||
@@ -90,7 +90,7 @@ clicking on their names. | |||
90 | </string> | 90 | </string> |
91 | <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG --> | 91 | <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG --> |
92 | </panel> | 92 | </panel> |
93 | <panel background_visible="true" border="true" bottom="0" height="164" label="Roles" | 93 | <panel border="true" bottom="0" height="164" label="Roles" |
94 | left="1" name="roles_sub_tab" width="398"> | 94 | left="1" name="roles_sub_tab" width="398"> |
95 | <line_editor bevel_style="in" border_style="line" | 95 | <line_editor bevel_style="in" border_style="line" |
96 | border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall" | 96 | border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall" |
@@ -130,7 +130,7 @@ including the Everyone and Owner Roles. | |||
130 | <icon height="16" image_name="checkbox_enabled_false.tga" name="power_partial_icon" | 130 | <icon height="16" image_name="checkbox_enabled_false.tga" name="power_partial_icon" |
131 | width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG --> | 131 | width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG --> |
132 | </panel> | 132 | </panel> |
133 | <panel background_visible="true" bg_alpha_color="red" border="true" bottom="0" | 133 | <panel border="true" bottom="0" |
134 | height="164" label="Abilities" left="1" name="actions_sub_tab" width="398"> | 134 | height="164" label="Abilities" left="1" name="actions_sub_tab" width="398"> |
135 | <line_editor bevel_style="in" border_style="line" | 135 | <line_editor bevel_style="in" border_style="line" |
136 | border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall" | 136 | border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall" |
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml index b5f276d..8378eb2 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml | |||
@@ -89,10 +89,9 @@ | |||
89 | 1.23.4 (5) | 89 | 1.23.4 (5) |
90 | </text> | 90 | </text> |
91 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 91 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
92 | bottom="10" drop_shadow_visible="true" follows="right|bottom" | 92 | bottom="7" drop_shadow_visible="true" follows="left|bottom" |
93 | font="SansSerifSmall" h_pad="0" halign="right" height="12" | 93 | font="SansSerifSmall" font-style="SHADOW" h_pad="0" halign="right" height="16" |
94 | left="-180" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170" | 94 | left="440" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170" |
95 | hover="true"> | 95 | hover="true" hover_color="50 115 185">Forgot your name or password? |
96 | Forgot your password? | ||
97 | </text> | 96 | </text> |
98 | </panel> | 97 | </panel> |
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml index e679537..99a376b 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml | |||
@@ -179,6 +179,9 @@ | |||
179 | <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko"> | 179 | <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko"> |
180 | 한국어 (Korean) - Beta | 180 | 한국어 (Korean) - Beta |
181 | </combo_item> | 181 | </combo_item> |
182 | <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt"> | ||
183 | Portugués (Portuguese) - Beta | ||
184 | </combo_item> | ||
182 | <combo_item type="string" length="1" enabled="true" name="Spanish" value="es"> | 185 | <combo_item type="string" length="1" enabled="true" name="Spanish" value="es"> |
183 | Español (Spanish) - Beta | 186 | Español (Spanish) - Beta |
184 | </combo_item> | 187 | </combo_item> |