diff --git a/indra/newview/app_settings/mime_types.xml b/indra/newview/app_settings/mime_types.xml new file mode 100644 index 000000000..715ac02b6 --- /dev/null +++ b/indra/newview/app_settings/mime_types.xml @@ -0,0 +1,445 @@ + + + + (Unknown) + + + none + + + media_plugin_webkit + + + + + icn_media_web.tga + + + text/html + + + This location has Web content + + + Show Web content + + + true + + + false + + + + + + video/* + + + icn_media_movie.tga + + + There is a movie to play here + + + Play movie + + + false + + + true + + + + + + icn_media_web.tga + + + image/* + + + There is an image at this location + + + View this location's image + + + false + + + false + + + + + + icn_media_web.tga + + + audio/* + + + There is audio at this location + + + Play this location's audio + + + false + + + true + + + + + + movie + + + media_plugin_quicktime + + + + + + none + + + media_plugin_quicktime + + + + + + none + + + + + + audio + + + + + + movie + + + + + + image + + + + + + movie + + + media_plugin_quicktime + + + + + + web + + + + + + audio + + + + + + image + + + + + + image + + + + + + image + + + + + + movie + + + media_plugin_quicktime + + + + + + web + + + + + + image + + + + + + audio + + + media_plugin_quicktime + + + + + + audio + + + media_plugin_quicktime + + + + + + audio + + + media_plugin_quicktime + + + + + + audio + + + media_plugin_quicktime + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + web + + + media_plugin_webkit + + + + + + text + + + media_plugin_webkit + + + + + + text + + + media_plugin_webkit + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + diff --git a/indra/newview/skins/default/xui/en-us/floater_import.xml b/indra/newview/skins/default/xui/en-us/floater_import.xml old mode 100644 new mode 100755 index 31fc491db..2e438135c --- a/indra/newview/skins/default/xui/en-us/floater_import.xml +++ b/indra/newview/skins/default/xui/en-us/floater_import.xml @@ -1,24 +1,24 @@ - - - - Name: - - - - Description: - - - - Files to upload: - - -