diff options
author | McCabe Maxsted | 2010-09-07 23:35:39 -0700 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:38:31 +0200 |
commit | 12810aeb0cc9c252d9295101d06dd0eb8711d8c6 (patch) | |
tree | c6d4721ed014efaff18fc792c05f277091183a78 /linden/indra/newview | |
parent | Fixed floatervicelicense not compiling with the new media changes (diff) | |
download | meta-impy-12810aeb0cc9c252d9295101d06dd0eb8711d8c6.zip meta-impy-12810aeb0cc9c252d9295101d06dd0eb8711d8c6.tar.gz meta-impy-12810aeb0cc9c252d9295101d06dd0eb8711d8c6.tar.bz2 meta-impy-12810aeb0cc9c252d9295101d06dd0eb8711d8c6.tar.xz |
Fixed 'there is no media type for text/html' errors
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llmimetypes.cpp | 18 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/mime_types.xml | 451 |
2 files changed, 469 insertions, 0 deletions
diff --git a/linden/indra/newview/llmimetypes.cpp b/linden/indra/newview/llmimetypes.cpp index 525e89c..c45e0ab 100644 --- a/linden/indra/newview/llmimetypes.cpp +++ b/linden/indra/newview/llmimetypes.cpp | |||
@@ -56,6 +56,24 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename) | |||
56 | { | 56 | { |
57 | LLXMLNodePtr root; | 57 | LLXMLNodePtr root; |
58 | bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root); | 58 | bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root); |
59 | |||
60 | if (!success) | ||
61 | { | ||
62 | // If fails, check if we can read the file from the app_settings folder | ||
63 | std::string settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, xml_filename); | ||
64 | success = LLUICtrlFactory::getLayeredXMLNode(settings_filename, root); | ||
65 | |||
66 | #if LL_WINDOWS | ||
67 | // On the windows dev builds, unpackaged, the mime_types.xml file will be located in | ||
68 | // indra/build-vc**/newview/<config>/app_settings. | ||
69 | if (!success) | ||
70 | { | ||
71 | settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", xml_filename); | ||
72 | success = LLUICtrlFactory::getLayeredXMLNode(settings_filename, root); | ||
73 | } | ||
74 | #endif | ||
75 | } | ||
76 | |||
59 | if ( ! success || root.isNull() || ! root->hasName( "mimetypes" ) ) | 77 | if ( ! success || root.isNull() || ! root->hasName( "mimetypes" ) ) |
60 | { | 78 | { |
61 | llwarns << "Unable to read MIME type file: " | 79 | llwarns << "Unable to read MIME type file: " |
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml index e69de29..9f0c631 100644 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml | |||
@@ -0,0 +1,451 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <mimetypes name="default"> | ||
3 | <defaultlabel> | ||
4 | (Unknown) | ||
5 | </defaultlabel> | ||
6 | <defaultwidget> | ||
7 | none | ||
8 | </defaultwidget> | ||
9 | <defaultimpl> | ||
10 | media_plugin_webkit | ||
11 | </defaultimpl> | ||
12 | <widgetset name="web"> | ||
13 | <label name="web_label"> | ||
14 | Web Content | ||
15 | </label> | ||
16 | <icon> | ||
17 | icn_media_web.tga | ||
18 | </icon> | ||
19 | <default_type> | ||
20 | text/html | ||
21 | </default_type> | ||
22 | <tooltip name="web_tooltip"> | ||
23 | This location has Web content | ||
24 | </tooltip> | ||
25 | <playtip name="web_playtip"> | ||
26 | Show Web content | ||
27 | </playtip> | ||
28 | <allow_resize> | ||
29 | true | ||
30 | </allow_resize> | ||
31 | <allow_looping> | ||
32 | false | ||
33 | </allow_looping> | ||
34 | </widgetset> | ||
35 | <widgetset name="movie"> | ||
36 | <label name="movie_label"> | ||
37 | Movie | ||
38 | </label> | ||
39 | <default_type> | ||
40 | video/* | ||
41 | </default_type> | ||
42 | <icon> | ||
43 | icn_media_movie.tga | ||
44 | </icon> | ||
45 | <tooltip name="movie_tooltip"> | ||
46 | There is a movie to play here | ||
47 | </tooltip> | ||
48 | <playtip name="movie_playtip"> | ||
49 | Play movie | ||
50 | </playtip> | ||
51 | <allow_resize> | ||
52 | false | ||
53 | </allow_resize> | ||
54 | <allow_looping> | ||
55 | true | ||
56 | </allow_looping> | ||
57 | </widgetset> | ||
58 | <widgetset name="image"> | ||
59 | <label name="image_label"> | ||
60 | Image | ||
61 | </label> | ||
62 | <icon> | ||
63 | icn_media_web.tga | ||
64 | </icon> | ||
65 | <default_type> | ||
66 | image/* | ||
67 | </default_type> | ||
68 | <tooltip name="image_tooltip"> | ||
69 | There is an image at this location | ||
70 | </tooltip> | ||
71 | <playtip name="image_playtip"> | ||
72 | View this location's image | ||
73 | </playtip> | ||
74 | <allow_resize> | ||
75 | false | ||
76 | </allow_resize> | ||
77 | <allow_looping> | ||
78 | false | ||
79 | </allow_looping> | ||
80 | </widgetset> | ||
81 | <widgetset name="audio"> | ||
82 | <label name="audio_label"> | ||
83 | Audio | ||
84 | </label> | ||
85 | <icon> | ||
86 | icn_media_web.tga | ||
87 | </icon> | ||
88 | <default_type> | ||
89 | audio/* | ||
90 | </default_type> | ||
91 | <tooltip name="audio_tooltip"> | ||
92 | There is audio at this location | ||
93 | </tooltip> | ||
94 | <playtip name="audio_playtip"> | ||
95 | Play this location's audio | ||
96 | </playtip> | ||
97 | <allow_resize> | ||
98 | false | ||
99 | </allow_resize> | ||
100 | <allow_looping> | ||
101 | true | ||
102 | </allow_looping> | ||
103 | </widgetset> | ||
104 | <scheme name="rtsp"> | ||
105 | <label name="rtsp_label"> | ||
106 | Real Time Streaming | ||
107 | </label> | ||
108 | <widgettype> | ||
109 | movie | ||
110 | </widgettype> | ||
111 | <impl> | ||
112 | media_plugin_quicktime | ||
113 | </impl> | ||
114 | </scheme> | ||
115 | <mimetype name="blank"> | ||
116 | <label name="blank_label"> | ||
117 | - None - | ||
118 | </label> | ||
119 | <widgettype> | ||
120 | none | ||
121 | </widgettype> | ||
122 | <impl> | ||
123 | media_plugin_quicktime | ||
124 | </impl> | ||
125 | </mimetype> | ||
126 | <mimetype name="none/none"> | ||
127 | <label name="none/none_label"> | ||
128 | - None - | ||
129 | </label> | ||
130 | <widgettype> | ||
131 | none | ||
132 | </widgettype> | ||
133 | </mimetype> | ||
134 | <mimetype name="audio/*"> | ||
135 | <label name="audio2_label"> | ||
136 | Audio | ||
137 | </label> | ||
138 | <widgettype> | ||
139 | audio | ||
140 | </widgettype> | ||
141 | <impl> | ||
142 | media_plugin_quicktime | ||
143 | </impl> | ||
144 | </mimetype> | ||
145 | <mimetype name="video/*"> | ||
146 | <label name="video2_label"> | ||
147 | Video | ||
148 | </label> | ||
149 | <widgettype> | ||
150 | movie | ||
151 | </widgettype> | ||
152 | <impl> | ||
153 | media_plugin_quicktime | ||
154 | </impl> | ||
155 | </mimetype> | ||
156 | <mimetype name="image/*"> | ||
157 | <label name="image2_label"> | ||
158 | Image | ||
159 | </label> | ||
160 | <widgettype> | ||
161 | image | ||
162 | </widgettype> | ||
163 | </mimetype> | ||
164 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | ||
165 | <label name="vnd.secondlife.qt.legacy_label"> | ||
166 | Movie (QuickTime) | ||
167 | </label> | ||
168 | <widgettype> | ||
169 | movie | ||
170 | </widgettype> | ||
171 | <impl> | ||
172 | media_plugin_quicktime | ||
173 | </impl> | ||
174 | </mimetype> | ||
175 | <mimetype name="application/javascript"> | ||
176 | <label name="application/javascript_label"> | ||
177 | Javascript | ||
178 | </label> | ||
179 | <widgettype> | ||
180 | web | ||
181 | </widgettype> | ||
182 | </mimetype> | ||
183 | <mimetype name="application/ogg"> | ||
184 | <label name="application/ogg_label"> | ||
185 | Ogg Audio/Video | ||
186 | </label> | ||
187 | <widgettype> | ||
188 | audio | ||
189 | </widgettype> | ||
190 | </mimetype> | ||
191 | <mimetype name="application/pdf"> | ||
192 | <label name="application/pdf_label"> | ||
193 | PDF Document | ||
194 | </label> | ||
195 | <widgettype> | ||
196 | image | ||
197 | </widgettype> | ||
198 | </mimetype> | ||
199 | <mimetype name="application/postscript"> | ||
200 | <label name="application/postscript_label"> | ||
201 | Postscript Document | ||
202 | </label> | ||
203 | <widgettype> | ||
204 | image | ||
205 | </widgettype> | ||
206 | </mimetype> | ||
207 | <mimetype name="application/rtf"> | ||
208 | <label name="application/rtf_label"> | ||
209 | Rich Text (RTF) | ||
210 | </label> | ||
211 | <widgettype> | ||
212 | image | ||
213 | </widgettype> | ||
214 | </mimetype> | ||
215 | <mimetype name="application/smil"> | ||
216 | <label name="application/smil_label"> | ||
217 | Synchronized Multimedia Integration Language (SMIL) | ||
218 | </label> | ||
219 | <widgettype> | ||
220 | movie | ||
221 | </widgettype> | ||
222 | <impl> | ||
223 | media_plugin_quicktime | ||
224 | </impl> | ||
225 | </mimetype> | ||
226 | <mimetype name="application/xhtml+xml"> | ||
227 | <label name="application/xhtml+xml_label"> | ||
228 | Web Page (XHTML) | ||
229 | </label> | ||
230 | <widgettype> | ||
231 | web | ||
232 | </widgettype> | ||
233 | </mimetype> | ||
234 | <mimetype name="application/x-director"> | ||
235 | <label name="application/x-director_label"> | ||
236 | Macromedia Director | ||
237 | </label> | ||
238 | <widgettype> | ||
239 | image | ||
240 | </widgettype> | ||
241 | </mimetype> | ||
242 | <mimetype name="audio/mid"> | ||
243 | <label name="audio/mid_label"> | ||
244 | Audio (MIDI) | ||
245 | </label> | ||
246 | <widgettype> | ||
247 | audio | ||
248 | </widgettype> | ||
249 | <impl> | ||
250 | media_plugin_quicktime | ||
251 | </impl> | ||
252 | </mimetype> | ||
253 | <mimetype name="audio/mpeg"> | ||
254 | <label name="audio/mpeg_label"> | ||
255 | Audio (MP3) | ||
256 | </label> | ||
257 | <widgettype> | ||
258 | audio | ||
259 | </widgettype> | ||
260 | <impl> | ||
261 | media_plugin_quicktime | ||
262 | </impl> | ||
263 | </mimetype> | ||
264 | <mimetype name="audio/x-aiff"> | ||
265 | <label name="audio/x-aiff_label"> | ||
266 | Audio (AIFF) | ||
267 | </label> | ||
268 | <widgettype> | ||
269 | audio | ||
270 | </widgettype> | ||
271 | <impl> | ||
272 | media_plugin_quicktime | ||
273 | </impl> | ||
274 | </mimetype> | ||
275 | <mimetype name="audio/x-wav"> | ||
276 | <label name="audio/x-wav_label"> | ||
277 | Audio (WAV) | ||
278 | </label> | ||
279 | <widgettype> | ||
280 | audio | ||
281 | </widgettype> | ||
282 | <impl> | ||
283 | media_plugin_quicktime | ||
284 | </impl> | ||
285 | </mimetype> | ||
286 | <mimetype menu="1" name="image/bmp"> | ||
287 | <label name="image/bmp_label"> | ||
288 | Image (BMP) | ||
289 | </label> | ||
290 | <widgettype> | ||
291 | image | ||
292 | </widgettype> | ||
293 | <impl> | ||
294 | media_plugin_webkit | ||
295 | </impl> | ||
296 | </mimetype> | ||
297 | <mimetype menu="1" name="image/gif"> | ||
298 | <label name="image/gif_label"> | ||
299 | Image (GIF) | ||
300 | </label> | ||
301 | <widgettype> | ||
302 | image | ||
303 | </widgettype> | ||
304 | <impl> | ||
305 | media_plugin_webkit | ||
306 | </impl> | ||
307 | </mimetype> | ||
308 | <mimetype menu="1" name="image/jpeg"> | ||
309 | <label name="image/jpeg_label"> | ||
310 | Image (JPEG) | ||
311 | </label> | ||
312 | <widgettype> | ||
313 | image | ||
314 | </widgettype> | ||
315 | <impl> | ||
316 | media_plugin_webkit | ||
317 | </impl> | ||
318 | </mimetype> | ||
319 | <mimetype menu="1" name="image/png"> | ||
320 | <label name="image/png_label"> | ||
321 | Image (PNG) | ||
322 | </label> | ||
323 | <widgettype> | ||
324 | image | ||
325 | </widgettype> | ||
326 | <impl> | ||
327 | media_plugin_webkit | ||
328 | </impl> | ||
329 | </mimetype> | ||
330 | <mimetype name="image/svg+xml"> | ||
331 | <label name="image/svg+xml_label"> | ||
332 | Image (SVG) | ||
333 | </label> | ||
334 | <widgettype> | ||
335 | image | ||
336 | </widgettype> | ||
337 | <impl> | ||
338 | media_plugin_webkit | ||
339 | </impl> | ||
340 | </mimetype> | ||
341 | <mimetype menu="1" name="image/tiff"> | ||
342 | <label name="image/tiff_label"> | ||
343 | Image (TIFF) | ||
344 | </label> | ||
345 | <widgettype> | ||
346 | image | ||
347 | </widgettype> | ||
348 | <impl> | ||
349 | media_plugin_webkit | ||
350 | </impl> | ||
351 | </mimetype> | ||
352 | <mimetype menu="1" name="text/html"> | ||
353 | <label name="text/html_label"> | ||
354 | Web Page | ||
355 | </label> | ||
356 | <widgettype> | ||
357 | web | ||
358 | </widgettype> | ||
359 | <impl> | ||
360 | media_plugin_webkit | ||
361 | </impl> | ||
362 | </mimetype> | ||
363 | <mimetype menu="1" name="text/plain"> | ||
364 | <label name="text/plain_label"> | ||
365 | Text | ||
366 | </label> | ||
367 | <widgettype> | ||
368 | text | ||
369 | </widgettype> | ||
370 | <impl> | ||
371 | media_plugin_webkit | ||
372 | </impl> | ||
373 | </mimetype> | ||
374 | <mimetype name="text/xml"> | ||
375 | <label name="text/xml_label"> | ||
376 | XML | ||
377 | </label> | ||
378 | <widgettype> | ||
379 | text | ||
380 | </widgettype> | ||
381 | <impl> | ||
382 | media_plugin_webkit | ||
383 | </impl> | ||
384 | </mimetype> | ||
385 | <mimetype menu="1" name="video/mpeg"> | ||
386 | <label name="video/mpeg_label"> | ||
387 | Movie (MPEG) | ||
388 | </label> | ||
389 | <widgettype> | ||
390 | movie | ||
391 | </widgettype> | ||
392 | <impl> | ||
393 | media_plugin_quicktime | ||
394 | </impl> | ||
395 | </mimetype> | ||
396 | <mimetype name="video/mp4"> | ||
397 | <label name="video/mp4_label"> | ||
398 | Movie (MP4) | ||
399 | </label> | ||
400 | <widgettype> | ||
401 | movie | ||
402 | </widgettype> | ||
403 | <impl> | ||
404 | media_plugin_quicktime | ||
405 | </impl> | ||
406 | </mimetype> | ||
407 | <mimetype menu="1" name="video/quicktime"> | ||
408 | <label name="video/quicktime_label"> | ||
409 | Movie (QuickTime) | ||
410 | </label> | ||
411 | <widgettype> | ||
412 | movie | ||
413 | </widgettype> | ||
414 | <impl> | ||
415 | media_plugin_quicktime | ||
416 | </impl> | ||
417 | </mimetype> | ||
418 | <mimetype name="video/x-ms-asf"> | ||
419 | <label name="video/x-ms-asf_label"> | ||
420 | Movie (Windows Media ASF) | ||
421 | </label> | ||
422 | <widgettype> | ||
423 | movie | ||
424 | </widgettype> | ||
425 | <impl> | ||
426 | media_plugin_quicktime | ||
427 | </impl> | ||
428 | </mimetype> | ||
429 | <mimetype name="video/x-ms-wmv"> | ||
430 | <label name="video/x-ms-wmv_label"> | ||
431 | Movie (Windows Media WMV) | ||
432 | </label> | ||
433 | <widgettype> | ||
434 | movie | ||
435 | </widgettype> | ||
436 | <impl> | ||
437 | media_plugin_quicktime | ||
438 | </impl> | ||
439 | </mimetype> | ||
440 | <mimetype menu="1" name="video/x-msvideo"> | ||
441 | <label name="video/x-msvideo_label"> | ||
442 | Movie (AVI) | ||
443 | </label> | ||
444 | <widgettype> | ||
445 | movie | ||
446 | </widgettype> | ||
447 | <impl> | ||
448 | media_plugin_quicktime | ||
449 | </impl> | ||
450 | </mimetype> | ||
451 | </mimetypes> | ||