diff options
Diffstat (limited to 'linden/indra/newview/skins/default')
13 files changed, 2283 insertions, 196 deletions
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml index 0b4a088..f2189a4 100644 --- a/linden/indra/newview/skins/default/textures/textures.xml +++ b/linden/indra/newview/skins/default/textures/textures.xml | |||
@@ -16,7 +16,9 @@ | |||
16 | <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> | 16 | <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> |
17 | 17 | ||
18 | <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" /> | 18 | <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" /> |
19 | 19 | ||
20 | <texture name="media_panel_bg.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" /> | ||
21 | <texture name="media_panel_hoverrectangle.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" /> | ||
20 | <texture name="checkbox_disabled_false.tga" preload="true"/> | 22 | <texture name="checkbox_disabled_false.tga" preload="true"/> |
21 | <texture name="checkbox_disabled_true.tga" preload="true"/> | 23 | <texture name="checkbox_disabled_true.tga" preload="true"/> |
22 | <texture name="checkbox_enabled_false.tga" preload="true"/> | 24 | <texture name="checkbox_enabled_false.tga" preload="true"/> |
@@ -376,7 +378,23 @@ | |||
376 | <texture name="default_profile_picture.j2c"/> | 378 | <texture name="default_profile_picture.j2c"/> |
377 | <texture name="locked_image.j2c"/> | 379 | <texture name="locked_image.j2c"/> |
378 | 380 | ||
381 | |||
379 | <!-- Kitty Viewer Art --> | 382 | <!-- Kitty Viewer Art --> |
380 | <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" /> | 383 | <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" /> |
381 | <texture name="Inv_WaterLight" file_name="Inv_WaterLight.png" preload="false" /> | 384 | <texture name="Inv_WaterLight" file_name="Inv_WaterLight.png" preload="false" /> |
385 | |||
386 | <texture name="media_btn_back.png"/> | ||
387 | <texture name="media_btn_done.png"/> | ||
388 | <texture name="media_btn_forward.png"/> | ||
389 | <texture name="media_btn_home.png"/> | ||
390 | <texture name="media_btn_newwindow.png"/> | ||
391 | <texture name="media_btn_optimalzoom.png"/> | ||
392 | <texture name="media_btn_reload.png"/> | ||
393 | <texture name="media_btn_scrolldown.png"/> | ||
394 | <texture name="media_btn_scrollleft.png"/> | ||
395 | <texture name="media_btn_scrollright.png"/> | ||
396 | <texture name="media_btn_scrollup.png"/> | ||
397 | <texture name="media_btn_stoploading.png"/> | ||
398 | <texture name="media_panel_divider.png"/> | ||
399 | |||
382 | </textures> | 400 | </textures> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml index 9bc91e7..c8aacba 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml | |||
@@ -800,143 +800,633 @@ Only large parcels can be listed in search. | |||
800 | No Pushing (Region Override) | 800 | No Pushing (Region Override) |
801 | </string> | 801 | </string> |
802 | </panel> | 802 | </panel> |
803 | <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom" | 803 | <panel |
804 | height="363" label="Media" left="1" mouse_opaque="true" | 804 | border="true" |
805 | name="land_media_panel" width="458"> | 805 | border_visible="true" |
806 | <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16" | 806 | bottom="-363" |
807 | left="10" mouse_opaque="true" name="with media:" width="65"> | 807 | enabled="true" |
808 | Media Type: | 808 | follows="left|top|right|bottom" |
809 | </text> | 809 | height="513" |
810 | <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18" | 810 | label="Media" |
811 | left="80" max_chars="20" name="media type" | 811 | left="1" |
812 | tool_tip="Specify if the URL is a movie, web page, or other media" | 812 | mouse_opaque="true" |
813 | width="120" /> | 813 | name="land_media_panel" |
814 | <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" | 814 | width="458"> |
815 | left_delta="130" name="mime_type" width="200" /> | 815 | <text |
816 | <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left" | 816 | bottom="-25" |
817 | height="16" left="10" name="at URL:" width="65"> | 817 | follows="left|top" |
818 | Media URL: | 818 | font="SansSerifSmall" |
819 | </text> | 819 | halign="left" |
820 | <line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80" | 820 | height="16" |
821 | max_length="255" name="media_url" right="-80" | 821 | left="10" |
822 | select_all_on_focus_received="true" select_on_focus="true" | 822 | length="1" |
823 | text_readonly_color="0.576471 0.662745 0.835294 1" /> | 823 | mouse_opaque="true" |
824 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" | 824 | name="with media:" |
825 | height="16" label="Set..." label_selected="Set..." mouse_opaque="true" | 825 | type="string" |
826 | name="set_media_url" right="-12" scale_image="true" width="60" /> | 826 | width="65"> |
827 | <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left" | 827 | Type: |
828 | height="16" left="10" name="Description:" width="364"> | 828 | </text> |
829 | <combo_box | ||
830 | allow_text_entry="false" | ||
831 | bottom_delta="0" | ||
832 | follows="left|top" | ||
833 | height="18" | ||
834 | left="80" | ||
835 | max_chars="20" | ||
836 | name="media type" | ||
837 | tool_tip="Specify if the URL is a movie, web page, or other media" | ||
838 | width="120" /> | ||
839 | <text | ||
840 | bottom_delta="0" | ||
841 | follows="left|top" | ||
842 | font="SansSerifSmall" | ||
843 | height="16" | ||
844 | left_delta="130" | ||
845 | name="mime_type" | ||
846 | width="200" /> | ||
847 | <text type="string" | ||
848 | bottom_delta="-21" | ||
849 | follows="left|top" | ||
850 | font="SansSerifSmall" halign="left" | ||
851 | height="16" | ||
852 | left="10" | ||
853 | length="1" | ||
854 | name="at URL:" | ||
855 | width="65"> | ||
856 | Home URL: | ||
857 | </text> | ||
858 | <line_editor | ||
859 | bottom_delta="0" | ||
860 | follows="left|top|right" | ||
861 | font="SansSerifSmall" | ||
862 | height="16" | ||
863 | left="80" | ||
864 | max_length="255" | ||
865 | name="media_url" | ||
866 | right="-90" | ||
867 | select_all_on_focus_received="true" | ||
868 | select_on_focus="true" | ||
869 | text_readonly_color="0.576471 0.662745 0.835294 1" /> | ||
870 | <button | ||
871 | bottom_delta="0" | ||
872 | follows="right|top" | ||
873 | font="SansSerifSmall" | ||
874 | halign="center" | ||
875 | height="16" | ||
876 | label="Set..." | ||
877 | label_selected="Set..." | ||
878 | mouse_opaque="true" | ||
879 | name="set_media_url" | ||
880 | right="-12" | ||
881 | scale_image="true" | ||
882 | width="70" /> | ||
883 | <text | ||
884 | bottom_delta="-22" | ||
885 | follows="left|top" | ||
886 | font="SansSerifSmall" | ||
887 | halign="left" | ||
888 | height="16" | ||
889 | left="10" | ||
890 | length="1" | ||
891 | name="at URL:" | ||
892 | type="string" | ||
893 | width="65"> | ||
894 | Current URL: | ||
895 | </text> | ||
896 | <text | ||
897 | bottom_delta="0" | ||
898 | follows="left|top|right" | ||
899 | font="SansSerifSmall" | ||
900 | halign="left" | ||
901 | height="16" | ||
902 | left="80" | ||
903 | name="current_url" | ||
904 | right="-90" /> | ||
905 | <button | ||
906 | bottom_delta="0" | ||
907 | follows="right|top" | ||
908 | font="SansSerifSmall" | ||
909 | halign="center" | ||
910 | height="16" | ||
911 | label="Reset..." | ||
912 | label_selected="Reset..." | ||
913 | mouse_opaque="true" | ||
914 | name="reset_media_url" | ||
915 | right="-12" | ||
916 | scale_image="true" | ||
917 | width="70" /> | ||
918 | <check_box | ||
919 | bottom_delta="-22" | ||
920 | enabled="true" | ||
921 | follows="left|top" | ||
922 | font="SansSerifSmall" | ||
923 | height="16" | ||
924 | initial_value="false" | ||
925 | label="Hide URL" | ||
926 | left="80" | ||
927 | mouse_opaque="true" | ||
928 | name="hide_media_url" | ||
929 | radio_style="false" | ||
930 | tool_tip="Checking this option will hide the media URL from any non-authorized viewers of this parcel information. Note this is not available for HTML types." | ||
931 | width="150" /> | ||
932 | <text | ||
933 | bottom_delta="0" | ||
934 | follows="right|top" | ||
935 | font="SansSerifSmall" | ||
936 | halign="right" | ||
937 | height="16" | ||
938 | length="1" | ||
939 | name="media_reset" | ||
940 | right="-164" | ||
941 | tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)" | ||
942 | type="string" | ||
943 | width="185"> | ||
944 | Return to Home URL in: | ||
945 | </text> | ||
946 | <spinner | ||
947 | bottom_delta="0" | ||
948 | decimal_digits="0" | ||
949 | enabled="false" | ||
950 | follows="right|top" | ||
951 | halign="right" | ||
952 | height="16" | ||
953 | increment="1" | ||
954 | initial_val="0" | ||
955 | max_val="1024" | ||
956 | min_val="0" | ||
957 | name="media_reset_time" | ||
958 | right="-90" | ||
959 | tool_tip="Amount of time until parcel reverts to default URL (0 for never return)" | ||
960 | width="64" /> | ||
961 | <text | ||
962 | bottom_delta="0" | ||
963 | follows="right|top" | ||
964 | font="SansSerifSmall" | ||
965 | halign="left" | ||
966 | height="16" | ||
967 | left_delta="70" | ||
968 | length="1" | ||
969 | name="minutes" | ||
970 | right="-10" | ||
971 | type="string"> | ||
972 | Minutes | ||
973 | </text> | ||
974 | <text | ||
975 | bottom_delta="-22" | ||
976 | follows="left|top" | ||
977 | font="SansSerifSmall" | ||
978 | halign="left" | ||
979 | height="16" | ||
980 | left="10" | ||
981 | length="1" | ||
982 | name="Description:" | ||
983 | type="string" | ||
984 | width="364"> | ||
829 | Description: | 985 | Description: |
830 | </text> | 986 | </text> |
831 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" | 987 | <line_editor |
832 | follows="left|top" font="SansSerifSmall" height="16" left="80" | 988 | bevel_style="in" |
833 | max_length="255" name="url_description" right="-80" | 989 | border_style="line" |
834 | select_all_on_focus_received="true" select_on_focus="true" | 990 | border_thickness="1" |
835 | tool_tip="Text displayed next to play/load button" spell_check="true" /> | 991 | bottom_delta="0" |
836 | <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left" | 992 | follows="left|top|right" |
837 | height="16" left="10" name="Media texture:" width="364"> | 993 | font="SansSerifSmall" |
838 | Replace | 994 | height="16" |
839 | Texture: | 995 | left="80" |
840 | </text> | 996 | max_length="255" |
841 | <texture_picker allow_no_texture="true" bottom_delta="-64" can_apply_immediately="false" | 997 | name="url_description" |
842 | default_image_name="Default" follows="left|top" height="80" label="" | 998 | right="-90" |
843 | left="80" name="media texture" tool_tip="Click to choose a picture" | 999 | select_all_on_focus_received="true" |
844 | width="64" /> | 1000 | select_on_focus="true" |
845 | <text type="string" length="1" bottom_delta="48" follows="left|top" font="SansSerifSmall" halign="left" | 1001 | tool_tip="Text displayed next to play/load button" /> |
846 | height="16" left_delta="75" name="replace_texture_help" width="270"> | 1002 | <text |
847 | (Objects using this texture will show the movie or | 1003 | bottom_delta="-28" |
848 | web page after you click the play arrow.) | 1004 | follows="left|top" |
849 | </text> | 1005 | font="SansSerifSmall" |
850 | <text type="string" length="1" bottom_delta="-55" follows="left|top" font="SansSerifSmall" halign="left" | 1006 | halign="left" |
851 | height="16" left="10" mouse_opaque="true" name="Options:" width="292"> | 1007 | height="16" |
852 | Media | 1008 | left="10" |
853 | Options: | 1009 | length="1" |
854 | </text> | 1010 | name="Media texture:" |
855 | <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" | 1011 | type="string" |
856 | height="16" initial_value="false" label="Auto scale" left="80" | 1012 | width="364"> |
857 | mouse_opaque="true" name="media_auto_scale" radio_style="false" | 1013 | Texture: |
858 | tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." | 1014 | </text> |
859 | width="200" /> | 1015 | <texture_picker |
860 | <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" | 1016 | allow_no_texture="true" |
861 | height="16" initial_value="false" label="Loop Media" left="250" | 1017 | bottom_delta="-64" |
862 | mouse_opaque="true" name="media_loop" radio_style="false" | 1018 | can_apply_immediately="false" |
863 | tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." | 1019 | default_image_name="Default" |
864 | width="200" /> | 1020 | follows="left|top" |
865 | <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" | 1021 | height="80" |
866 | height="16" initial_value="false" label="Hide Media URL" left="80" | 1022 | label="" |
867 | mouse_opaque="true" name="hide_media_url" radio_style="false" | 1023 | left="80" |
868 | tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." | 1024 | name="media texture" |
869 | width="200" /> | 1025 | tool_tip="Click to choose a texture" |
870 | <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" | 1026 | width="64" /> |
871 | height="16" initial_value="false" label="Hide Music URL" left="250" | 1027 | <text |
872 | mouse_opaque="true" name="hide_music_url" radio_style="false" | 1028 | type="string" |
873 | tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information" | 1029 | length="1" |
874 | width="200" /> | 1030 | bottom_delta="0" |
875 | <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left" | 1031 | follows="left|top" |
876 | height="16" left="85" name="media_size" | 1032 | font="SansSerifSmall" |
877 | tool_tip="Size to render Web media, leave 0 for default." width="85"> | 1033 | halign="left" |
878 | Media size: | 1034 | height="80" |
879 | </text> | 1035 | left_delta="75" |
880 | <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top" | 1036 | name="replace_texture_help" |
881 | halign="right" height="16" increment="1" initial_val="0" left_delta="65" | 1037 | width="270"> |
882 | max_val="1024" min_val="0" name="media_size_width" | 1038 | Objects using this texture will show the movie or |
883 | tool_tip="Size to render Web media, leave 0 for default." width="64" /> | 1039 | web page after you click the play arrow. |
884 | <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top" | 1040 | |
885 | halign="right" height="16" increment="1" initial_val="0" left_delta="80" | 1041 | Select the thumbnail to choose a different texture. |
886 | max_val="1024" min_val="0" name="media_size_height" | 1042 | </text> |
887 | tool_tip="Size to render Web media, leave 0 for default." width="64" /> | 1043 | <text |
888 | <text type="string" length="1" bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="left" | 1044 | bottom_delta="-16" |
889 | height="16" left_delta="70" name="pixels" right="-10"> | 1045 | follows="left|top" |
1046 | font="SansSerifSmall" | ||
1047 | halign="left" | ||
1048 | height="16" | ||
1049 | left="10" | ||
1050 | length="1" | ||
1051 | mouse_opaque="true" | ||
1052 | name="Options:" | ||
1053 | top_delta="0" | ||
1054 | type="string" | ||
1055 | width="64"> | ||
1056 | Options: | ||
1057 | </text> | ||
1058 | <check_box | ||
1059 | bottom_delta="0" | ||
1060 | enabled="true" | ||
1061 | follows="left|top" | ||
1062 | font="SansSerifSmall" | ||
1063 | height="16" | ||
1064 | initial_value="false" | ||
1065 | label="Loop" | ||
1066 | left="80" | ||
1067 | mouse_opaque="true" | ||
1068 | name="media_loop" | ||
1069 | radio_style="false" | ||
1070 | tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." | ||
1071 | width="200" /> | ||
1072 | <check_box | ||
1073 | bottom_delta="0" | ||
1074 | enabled="true" | ||
1075 | follows="left|top" | ||
1076 | font="SansSerifSmall" | ||
1077 | height="16" | ||
1078 | initial_value="false" | ||
1079 | label="Auto scale" | ||
1080 | left_delta="80" | ||
1081 | mouse_opaque="true" | ||
1082 | name="media_auto_scale" | ||
1083 | radio_style="false" | ||
1084 | tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." | ||
1085 | width="200" /> | ||
1086 | <text | ||
1087 | bottom_delta="-24" | ||
1088 | follows="left|top" | ||
1089 | font="SansSerifSmall" | ||
1090 | halign="left" | ||
1091 | height="16" | ||
1092 | left="10" | ||
1093 | length="1" | ||
1094 | name="media_size" | ||
1095 | tool_tip="Size to render Web media, leave 0 for default." | ||
1096 | type="string" | ||
1097 | width="85"> | ||
1098 | Media Size: | ||
1099 | </text> | ||
1100 | <spinner | ||
1101 | bottom_delta="0" | ||
1102 | decimal_digits="0" | ||
1103 | enabled="false" | ||
1104 | follows="left|top" | ||
1105 | halign="right" | ||
1106 | height="16" | ||
1107 | increment="1" | ||
1108 | initial_val="0" | ||
1109 | left="80" | ||
1110 | max_val="1024" | ||
1111 | min_val="0" | ||
1112 | name="media_size_width" | ||
1113 | tool_tip="Width to render Web media, leave 0 for default." | ||
1114 | width="60" /> | ||
1115 | <spinner | ||
1116 | bottom_delta="0" | ||
1117 | decimal_digits="0" | ||
1118 | enabled="false" | ||
1119 | follows="left|top" | ||
1120 | halign="right" | ||
1121 | height="16" | ||
1122 | increment="1" | ||
1123 | initial_val="0" | ||
1124 | left_delta="64" | ||
1125 | max_val="1024" | ||
1126 | min_val="0" | ||
1127 | name="media_size_height" | ||
1128 | tool_tip="Height to render Web media, leave 0 for default." | ||
1129 | width="60" /> | ||
1130 | <text | ||
1131 | bottom_delta="0" | ||
1132 | follows="left|top" | ||
1133 | font="SansSerifSmall" | ||
1134 | halign="left" | ||
1135 | height="16" | ||
1136 | left_delta="64" | ||
1137 | length="1" | ||
1138 | name="pixels" | ||
1139 | type="string" | ||
1140 | width="70"> | ||
890 | pixels | 1141 | pixels |
891 | </text> | 1142 | </text> |
892 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 1143 | <text |
893 | bottom_delta="-40" drop_shadow_visible="true" enabled="true" | 1144 | bg_visible="false" |
894 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" | 1145 | border_drop_shadow_visible="false" |
895 | height="16" left="10" mouse_opaque="true" name="MusicURL:" v_pad="0" | 1146 | border_visible="false" |
896 | width="364"> | 1147 | bottom_delta="-30" |
1148 | drop_shadow_visible="true" | ||
1149 | enabled="true" | ||
1150 | follows="left|top" | ||
1151 | font="SansSerifSmall" | ||
1152 | h_pad="0" | ||
1153 | halign="left" | ||
1154 | height="16" | ||
1155 | left="10" | ||
1156 | length="1" | ||
1157 | mouse_opaque="true" | ||
1158 | name="Interaction:" | ||
1159 | type="string" | ||
1160 | v_pad="0" | ||
1161 | width="364"> | ||
1162 | Interaction: | ||
1163 | </text> | ||
1164 | <radio_group | ||
1165 | bottom_delta="-2" | ||
1166 | draw_border="false" | ||
1167 | enabled="true" | ||
1168 | follows="left|top" | ||
1169 | height="22" | ||
1170 | left="80" | ||
1171 | mouse_opaque="true" | ||
1172 | name="radio_navigate_allow" | ||
1173 | tab_stop="true" | ||
1174 | width="219"> | ||
1175 | <radio_item | ||
1176 | bottom="-20" | ||
1177 | enabled="true" | ||
1178 | follows="left|top" | ||
1179 | height="16" | ||
1180 | left="0" | ||
1181 | length="1" | ||
1182 | mouse_opaque="true" | ||
1183 | name="Anyone" | ||
1184 | tool_tip="Any resident can interact with media." | ||
1185 | type="string" | ||
1186 | width="70"> | ||
1187 | Anyone | ||
1188 | </radio_item> | ||
1189 | <radio_item | ||
1190 | bottom="-20" | ||
1191 | enabled="true" | ||
1192 | follows="left|top" | ||
1193 | height="16" | ||
1194 | left="80" | ||
1195 | length="1" | ||
1196 | mouse_opaque="true" | ||
1197 | name="Group" | ||
1198 | tool_tip="Group permissions control who can interact with media." | ||
1199 | type="string" | ||
1200 | width="70"> | ||
1201 | Group | ||
1202 | </radio_item> | ||
1203 | </radio_group> | ||
1204 | <check_box | ||
1205 | bottom_delta="-22" | ||
1206 | enabled="true" | ||
1207 | follows="left|top" | ||
1208 | font="SansSerifSmall" | ||
1209 | height="16" | ||
1210 | initial_value="false" | ||
1211 | label="Allow browsing only within these domains:" | ||
1212 | left="80" | ||
1213 | mouse_opaque="true" | ||
1214 | name="check navigate filter" | ||
1215 | radio_style="false" | ||
1216 | width="292" /> | ||
1217 | <line_editor | ||
1218 | bevel_style="in" | ||
1219 | border_style="line" | ||
1220 | border_thickness="1" | ||
1221 | bottom_delta="-20" | ||
1222 | enabled="true" | ||
1223 | follows="left|top|right" | ||
1224 | font="SansSerifSmall" | ||
1225 | handle_edit_keys_directly="false" | ||
1226 | height="16" | ||
1227 | left="80" | ||
1228 | max_length="63" | ||
1229 | mouse_opaque="true" | ||
1230 | name="navigate_filter_domain" | ||
1231 | right="-90" | ||
1232 | select_all_on_focus_received="false" | ||
1233 | select_on_focus="false" /> | ||
1234 | <button | ||
1235 | bottom_delta="0" | ||
1236 | enabled="true" | ||
1237 | follows="right|top" | ||
1238 | font="SansSerifSmall" | ||
1239 | halign="center" | ||
1240 | height="16" | ||
1241 | label="Add..." | ||
1242 | label_selected="Add..." | ||
1243 | right="-12" | ||
1244 | mouse_opaque="true" | ||
1245 | name="add_navigate_filter" | ||
1246 | scale_image="true" | ||
1247 | width="70" /> | ||
1248 | <scroll_list | ||
1249 | bottom_delta="-52" | ||
1250 | can_resize="false" | ||
1251 | column_padding="0" | ||
1252 | draw_heading="false" | ||
1253 | draw_stripes="false" | ||
1254 | follows="left|top|right" | ||
1255 | height="50" | ||
1256 | halign="left" | ||
1257 | left="80" | ||
1258 | multi_select="false" | ||
1259 | name="filter_list" | ||
1260 | right="-90" | ||
1261 | search_column="0" | ||
1262 | sort_column="0"> | ||
1263 | <column | ||
1264 | halign="left" | ||
1265 | label="Domain" | ||
1266 | name="domain" | ||
1267 | sort="domain"/> | ||
1268 | </scroll_list> | ||
1269 | <button | ||
1270 | bottom_delta="0" | ||
1271 | enabled="true" | ||
1272 | follows="right|top" | ||
1273 | font="SansSerifSmall" | ||
1274 | halign="center" | ||
1275 | height="16" | ||
1276 | label="Remove" | ||
1277 | label_selected="Remove" | ||
1278 | right="-12" | ||
1279 | mouse_opaque="true" | ||
1280 | name="remove_navigate_filter" | ||
1281 | scale_image="true" | ||
1282 | width="70" /> | ||
1283 | </panel> | ||
1284 | <panel | ||
1285 | border="true" | ||
1286 | follows="left|top|right|bottom" | ||
1287 | height="363" | ||
1288 | label="Audio" | ||
1289 | layout="topleft" | ||
1290 | left_delta="0" | ||
1291 | name="land_audio_panel" | ||
1292 | top_delta="1" | ||
1293 | width="458"> | ||
1294 | <text | ||
1295 | bottom="-45" | ||
1296 | follows="left|top" | ||
1297 | height="16" | ||
1298 | layout="topleft" | ||
1299 | left="10" | ||
1300 | length="1" | ||
1301 | name="MusicURL:" | ||
1302 | type="string" | ||
1303 | width="364"> | ||
897 | Music URL: | 1304 | Music URL: |
898 | </text> | 1305 | </text> |
899 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" | 1306 | <line_editor |
900 | enabled="true" follows="left|top" font="SansSerifSmall" | 1307 | border_style="line" |
901 | handle_edit_keys_directly="false" height="16" left="80" max_length="255" | 1308 | border_thickness="1" |
902 | mouse_opaque="true" name="music_url" right="-15" | 1309 | bottom_delta="0" |
903 | select_all_on_focus_received="true" select_on_focus="true"/> | 1310 | follows="left|top|right" |
904 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 1311 | height="16" |
905 | bottom_delta="-40" drop_shadow_visible="true" enabled="true" | 1312 | layout="topleft" |
906 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" | 1313 | left="80" |
907 | height="16" left="10" mouse_opaque="true" name="Sound:" v_pad="0" | 1314 | max_length="255" |
908 | width="364"> | 1315 | name="music_url" |
1316 | right="-15" | ||
1317 | select_on_focus="true" /> | ||
1318 | <check_box | ||
1319 | bottom_delta="-25" | ||
1320 | enabled="true" | ||
1321 | follows="left|top" | ||
1322 | font="SansSerifSmall" | ||
1323 | height="16" | ||
1324 | initial_value="false" | ||
1325 | label="Hide URL" | ||
1326 | left="80" | ||
1327 | mouse_opaque="true" | ||
1328 | name="hide_music_url" | ||
1329 | radio_style="false" | ||
1330 | tool_tip="Checking this option will hide the music URL from any non-authorized viewers of this parcel information." | ||
1331 | width="150" /> | ||
1332 | <text | ||
1333 | bottom_delta="-65" | ||
1334 | follows="left|top" | ||
1335 | height="16" | ||
1336 | layout="topleft" | ||
1337 | left="10" | ||
1338 | length="1" | ||
1339 | name="Sound:" | ||
1340 | type="string" | ||
1341 | width="364"> | ||
909 | Sound: | 1342 | Sound: |
910 | </text> | 1343 | </text> |
911 | <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" | 1344 | <check_box |
912 | height="16" initial_value="false" | 1345 | bottom_delta="0" |
913 | label="Restrict gesture and object sounds to this parcel" left="80" | 1346 | follows="left|top" |
914 | mouse_opaque="true" name="check sound local" radio_style="false" | 1347 | height="16" |
915 | width="292" /> | 1348 | label="Restrict gesture and object sounds to this parcel" |
916 | <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif" | 1349 | layout="topleft" |
917 | halign="center" height="18" label="?" label_selected="?" left="372" | 1350 | left_delta="70" |
918 | mouse_opaque="true" name="?" width="18" /> | 1351 | name="check_sound_local" |
919 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 1352 | width="200" /> |
920 | bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall" | 1353 | <button |
921 | h_pad="0" halign="left" height="16" left="10" mouse_opaque="false" | 1354 | bottom_delta="0" |
922 | name="Voice settings:" tab_stop="false" v_pad="0" width="364"> | 1355 | follows="left|top" |
1356 | height="18" | ||
1357 | label="?" | ||
1358 | label_selected="?" | ||
1359 | layout="topleft" | ||
1360 | left_delta="292" | ||
1361 | name="?" | ||
1362 | width="18" /> | ||
1363 | <text | ||
1364 | bottom_delta="-65" | ||
1365 | follows="left|top" | ||
1366 | height="16" | ||
1367 | layout="topleft" | ||
1368 | left="10" | ||
1369 | length="1" | ||
1370 | mouse_opaque="false" | ||
1371 | name="Voice:" | ||
1372 | type="string" | ||
1373 | width="364"> | ||
923 | Voice: | 1374 | Voice: |
924 | </text> | 1375 | </text> |
925 | <check_box bottom_delta="-0" enabled="true" follows="left|top" | 1376 | <radio_group |
926 | height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel" | 1377 | bottom_delta="-40" |
927 | tab_stop="true" width="463" | 1378 | draw_border="false" |
928 | label="Enable Voice" | 1379 | enabled="true" |
929 | /> | 1380 | follows="left|top" |
930 | <check_box bottom_delta="-0" enabled="false" follows="left|top" | 1381 | height="60" |
931 | height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel_is_estate_disabled" | 1382 | left="80" |
932 | tab_stop="true" width="463" | 1383 | mouse_opaque="true" |
933 | label="Enable Voice (established by the Estate)" | 1384 | name="parcel_voice_channel" |
934 | /> | 1385 | tab_stop="true" |
935 | <check_box bottom_delta="-20" enabled="true" follows="left|top" | 1386 | width="219"> |
936 | height="54" left="100" mouse_opaque="true" name="parcel_enable_voice_channel_parcel" | 1387 | <radio_item |
937 | tab_stop="true" width="443" | 1388 | bottom="-19" |
938 | label="Restrict Voice to this parcel" | 1389 | enabled="true" |
939 | /> | 1390 | follows="left|top" |
1391 | height="16" | ||
1392 | left="0" | ||
1393 | length="1" | ||
1394 | mouse_opaque="true" | ||
1395 | name="Estate" | ||
1396 | tool_tip="Use the estate voice channel." | ||
1397 | type="string" | ||
1398 | width="70"> | ||
1399 | Estate Channel | ||
1400 | </radio_item> | ||
1401 | <radio_item | ||
1402 | bottom="-39" | ||
1403 | enabled="true" | ||
1404 | follows="left|top" | ||
1405 | height="16" | ||
1406 | left="0" | ||
1407 | length="1" | ||
1408 | mouse_opaque="true" | ||
1409 | name="Parcel" | ||
1410 | tool_tip="Restrict Voice to this parcel." | ||
1411 | type="string" | ||
1412 | width="70"> | ||
1413 | Parcel Channel | ||
1414 | </radio_item> | ||
1415 | <radio_item | ||
1416 | bottom="-59" | ||
1417 | enabled="true" | ||
1418 | follows="left|top" | ||
1419 | height="16" | ||
1420 | left="0" | ||
1421 | length="1" | ||
1422 | mouse_opaque="true" | ||
1423 | name="Disabled" | ||
1424 | tool_tip="Disable voice on this parcel." | ||
1425 | type="string" | ||
1426 | width="70"> | ||
1427 | Disabled | ||
1428 | </radio_item> | ||
1429 | </radio_group> | ||
940 | </panel> | 1430 | </panel> |
941 | <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom" | 1431 | <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom" |
942 | height="333" label="Access" left="1" mouse_opaque="true" | 1432 | height="333" label="Access" left="1" mouse_opaque="true" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml index 24a895b..e85eaa8 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml | |||
@@ -64,7 +64,35 @@ | |||
64 | tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled." | 64 | tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled." |
65 | width="315" /> | 65 | width="315" /> |
66 | 66 | ||
67 | <slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" | 67 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
68 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" | ||
69 | font="SansSerifSmall" h_pad="0" halign="left" height="12" | ||
70 | left="10" mouse_opaque="true" name="Enable FBO:" v_pad="0" | ||
71 | width="128"> | ||
72 | Enable FBO: | ||
73 | </text> | ||
74 | <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="true" follows="left|top" | ||
75 | font="SansSerifSmall" height="16" initial_value="true" | ||
76 | label="Enable OpenGL Framebuffer Objects" left="148" | ||
77 | mouse_opaque="true" name="fbo" radio_style="false" | ||
78 | tool_tip="Enabling this will use OpenGL Framebuffer objects for some dynamic textures. Prerequisite for deferred rendering." | ||
79 | width="315" /> | ||
80 | |||
81 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
82 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" | ||
83 | font="SansSerifSmall" h_pad="0" halign="left" height="12" | ||
84 | left="10" mouse_opaque="true" name="Deferred Rendering:" v_pad="0" | ||
85 | width="128"> | ||
86 | Deferred Rendering: | ||
87 | </text> | ||
88 | <check_box bottom_delta="-5" control_name="RenderDeferred" enabled="true" follows="left|top" | ||
89 | font="SansSerifSmall" height="16" initial_value="true" | ||
90 | label="Enable per-pixel lighting and shadows" left="148" | ||
91 | mouse_opaque="true" name="deferred" radio_style="false" | ||
92 | tool_tip="Enabling this will perform lighting calculations in screen space, enabling per pixel lighting for all lights and shadows from the sun/moon. Requires a fast graphics card. Might not be compatible with FSAA." | ||
93 | width="315" /> | ||
94 | |||
95 | <slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" | ||
68 | decimal_digits="0" enabled="true" | 96 | decimal_digits="0" enabled="true" |
69 | follows="left|top" height="16" increment="16" | 97 | follows="left|top" height="16" increment="16" |
70 | initial_val="32" label="Texture Memory (MB):" label_width="135" left="10" | 98 | initial_val="32" label="Texture Memory (MB):" label_width="135" left="10" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml index b30ca89..c1bfdcc 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml | |||
@@ -18,7 +18,20 @@ | |||
18 | <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home" | 18 | <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home" |
19 | left_delta="58" name="home" width="55" /> | 19 | left_delta="58" name="home" width="55" /> |
20 | </layout_panel> | 20 | </layout_panel> |
21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" | 21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false" |
22 | width="800"> | ||
23 | <button bottom="0" follows="left|top" height="20" label="rewind" left="0" name="rewind" | ||
24 | width="55" /> | ||
25 | <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="55" | ||
26 | name="play" width="55" image_unselected="button_anim_play.tga" image_selected="button_anim_play_selected.tga" scale_image="true" /> | ||
27 | <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="0" | ||
28 | name="pause" width="55" image_unselected="button_anim_pause.tga" image_selected="button_anim_pause_selected.tga" scale_image="true" /> | ||
29 | <button bottom_delta="0" follows="left|top" height="20" label="stop" | ||
30 | left_delta="65" name="stop" width="55" /> | ||
31 | <button bottom_delta="0" follows="left|top" height="20" label="forward" | ||
32 | left_delta="75" name="seek" width="55" /> | ||
33 | </layout_panel> | ||
34 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" | ||
22 | name="parcel_owner_controls" user_resize="false" width="540"> | 35 | name="parcel_owner_controls" user_resize="false" width="540"> |
23 | <button bottom="0" enabled="false" follows="left|top" height="20" | 36 | <button bottom="0" enabled="false" follows="left|top" height="20" |
24 | label="Send Current URL to Parcel" left="0" name="assign" width="200" /> | 37 | label="Send Current URL to Parcel" left="0" name="assign" width="200" /> |
@@ -38,4 +51,10 @@ | |||
38 | name="close" width="70" /> | 51 | name="close" width="70" /> |
39 | </layout_panel> | 52 | </layout_panel> |
40 | </layout_stack> | 53 | </layout_stack> |
54 | <string name="home_page_url"> | ||
55 | http://www.secondlife.com | ||
56 | </string> | ||
57 | <string name="support_page_url"> | ||
58 | http://support.secondlife.com | ||
59 | </string> | ||
41 | </floater> | 60 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml index 0cb4a59..1be2e58 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | |||
@@ -1036,25 +1036,47 @@ | |||
1036 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 1036 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
1037 | bottom_delta="-21" drop_shadow_visible="true" follows="left|top" | 1037 | bottom_delta="-21" drop_shadow_visible="true" follows="left|top" |
1038 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0" | 1038 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0" |
1039 | mouse_opaque="true" name="label color" v_pad="0" width="58"> | 1039 | mouse_opaque="true" name="label color" v_pad="0" width="57"> |
1040 | Color: | 1040 | Color: |
1041 | </text> | 1041 | </text> |
1042 | <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28" | 1042 | <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28" |
1043 | can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top" | 1043 | can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top" |
1044 | height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch" | 1044 | height="48" label="" left_delta="57" mouse_opaque="true" name="colorswatch" |
1045 | tool_tip="Click to open Color Picker" width="32" /> | 1045 | tool_tip="Click to open Color Picker" width="32" /> |
1046 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
1047 | bottom_delta="28" drop_shadow_visible="true" follows="left|top" | ||
1048 | font="SansSerifSmall" h_pad="0" height="10" left="144" | ||
1049 | mouse_opaque="true" name="label texture" v_pad="0" width="58"> | ||
1050 | Texture | ||
1051 | </text> | ||
1052 | <texture_picker allow_no_texture="true" bottom_delta="-28" can_apply_immediately="true" | ||
1053 | default_image_name="Default" follows="left|top" height="48" label="" | ||
1054 | left_delta="57" mouse_opaque="true" name="light texture control" | ||
1055 | tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)" width="32" /> | ||
1046 | <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16" | 1056 | <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16" |
1047 | increment="0.1" initial_val="0.5" label="Intensity:" label_width="65" | 1057 | increment="0.1" initial_val="0.5" label="Intensity:" label_width="55" |
1048 | left="10" max_val="1" min_val="0" mouse_opaque="true" | 1058 | left="10" max_val="1" min_val="0" mouse_opaque="true" |
1049 | name="Light Intensity" width="128" /> | 1059 | name="Light Intensity" width="120" /> |
1060 | <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" | ||
1061 | increment="0.1" initial_val="0.5" label="FOV" label_width="55" | ||
1062 | left="144" max_val="3" min_val="0" mouse_opaque="true" | ||
1063 | name="Light FOV" width="120" /> | ||
1050 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" | 1064 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" |
1051 | increment="0.1" initial_val="5" label="Radius:" label_width="65" | 1065 | increment="0.1" initial_val="5" label="Radius" label_width="55" |
1052 | left_delta="0" max_val="20" min_val="0" mouse_opaque="true" | 1066 | left="10" max_val="20" min_val="0" mouse_opaque="true" |
1053 | name="Light Radius" width="128" /> | 1067 | name="Light Radius" width="120" /> |
1068 | <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" | ||
1069 | increment="0.5" initial_val="0.5" label="Focus" label_width="55" | ||
1070 | left="144" max_val="20" min_val="-20" mouse_opaque="true" | ||
1071 | name="Light Focus" width="120" /> | ||
1054 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" | 1072 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" |
1055 | increment="0.25" initial_val="1" label="Falloff:" label_width="65" | 1073 | increment="0.25" initial_val="1" label="Falloff" label_width="55" |
1056 | left_delta="0" max_val="2" min_val="0" mouse_opaque="true" | 1074 | left="10" max_val="2" min_val="0" mouse_opaque="true" |
1057 | name="Light Falloff" width="128" /> | 1075 | name="Light Falloff" width="120" /> |
1076 | <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" | ||
1077 | increment="0.05" initial_val="1" label="Ambiance" label_width="55" | ||
1078 | left="144" max_val="1" min_val="0" mouse_opaque="true" | ||
1079 | name="Light Ambiance" width="120" /> | ||
1058 | </panel> | 1080 | </panel> |
1059 | 1081 | ||
1060 | <!-- Texture sub-tab --> | 1082 | <!-- Texture sub-tab --> |
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 e3d1021..360438a 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 | |||
@@ -7,7 +7,7 @@ | |||
7 | none | 7 | none |
8 | </defaultwidget> | 8 | </defaultwidget> |
9 | <defaultimpl> | 9 | <defaultimpl> |
10 | LLMediaImplLLMozLib | 10 | media_plugin_webkit |
11 | </defaultimpl> | 11 | </defaultimpl> |
12 | <widgetset name="web"> | 12 | <widgetset name="web"> |
13 | <label name="web_label"> | 13 | <label name="web_label"> |
@@ -55,27 +55,6 @@ | |||
55 | true | 55 | true |
56 | </allow_looping> | 56 | </allow_looping> |
57 | </widgetset> | 57 | </widgetset> |
58 | <widgetset name="none"> | ||
59 | <label name="none_label"> | ||
60 | No Content | ||
61 | </label> | ||
62 | <default_type> | ||
63 | none/none | ||
64 | </default_type> | ||
65 | <icon> | ||
66 | icn_media_web.tga | ||
67 | </icon> | ||
68 | <tooltip name="none_tooltip"> | ||
69 | No media here | ||
70 | </tooltip> | ||
71 | <playtip name="none_playtip" /> | ||
72 | <allow_resize> | ||
73 | false | ||
74 | </allow_resize> | ||
75 | <allow_looping> | ||
76 | false | ||
77 | </allow_looping> | ||
78 | </widgetset> | ||
79 | <widgetset name="image"> | 58 | <widgetset name="image"> |
80 | <label name="image_label"> | 59 | <label name="image_label"> |
81 | Image | 60 | Image |
@@ -129,6 +108,9 @@ | |||
129 | <widgettype> | 108 | <widgettype> |
130 | movie | 109 | movie |
131 | </widgettype> | 110 | </widgettype> |
111 | <impl> | ||
112 | media_plugin_gstreamer010 | ||
113 | </impl> | ||
132 | </scheme> | 114 | </scheme> |
133 | <mimetype name="blank"> | 115 | <mimetype name="blank"> |
134 | <label name="blank_label"> | 116 | <label name="blank_label"> |
@@ -138,7 +120,7 @@ | |||
138 | none | 120 | none |
139 | </widgettype> | 121 | </widgettype> |
140 | <impl> | 122 | <impl> |
141 | LLMediaImplQuickTime | 123 | media_plugin_webkit |
142 | </impl> | 124 | </impl> |
143 | </mimetype> | 125 | </mimetype> |
144 | <mimetype name="none/none"> | 126 | <mimetype name="none/none"> |
@@ -148,6 +130,9 @@ | |||
148 | <widgettype> | 130 | <widgettype> |
149 | none | 131 | none |
150 | </widgettype> | 132 | </widgettype> |
133 | <impl> | ||
134 | media_plugin_webkit | ||
135 | </impl> | ||
151 | </mimetype> | 136 | </mimetype> |
152 | <mimetype name="audio/*"> | 137 | <mimetype name="audio/*"> |
153 | <label name="audio2_label"> | 138 | <label name="audio2_label"> |
@@ -156,6 +141,9 @@ | |||
156 | <widgettype> | 141 | <widgettype> |
157 | audio | 142 | audio |
158 | </widgettype> | 143 | </widgettype> |
144 | <impl> | ||
145 | media_plugin_gstreamer010 | ||
146 | </impl> | ||
159 | </mimetype> | 147 | </mimetype> |
160 | <mimetype name="video/*"> | 148 | <mimetype name="video/*"> |
161 | <label name="video2_label"> | 149 | <label name="video2_label"> |
@@ -164,6 +152,9 @@ | |||
164 | <widgettype> | 152 | <widgettype> |
165 | movie | 153 | movie |
166 | </widgettype> | 154 | </widgettype> |
155 | <impl> | ||
156 | media_plugin_gstreamer010 | ||
157 | </impl> | ||
167 | </mimetype> | 158 | </mimetype> |
168 | <mimetype name="image/*"> | 159 | <mimetype name="image/*"> |
169 | <label name="image2_label"> | 160 | <label name="image2_label"> |
@@ -172,16 +163,19 @@ | |||
172 | <widgettype> | 163 | <widgettype> |
173 | image | 164 | image |
174 | </widgettype> | 165 | </widgettype> |
166 | <impl> | ||
167 | media_plugin_webkit | ||
168 | </impl> | ||
175 | </mimetype> | 169 | </mimetype> |
176 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | 170 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> |
177 | <label name="vnd.secondlife.qt.legacy_label"> | 171 | <label name="vnd.secondlife.qt.legacy_label"> |
178 | Movie (QuickTime) | 172 | Movie (gstreamer) |
179 | </label> | 173 | </label> |
180 | <widgettype> | 174 | <widgettype> |
181 | movie | 175 | movie |
182 | </widgettype> | 176 | </widgettype> |
183 | <impl> | 177 | <impl> |
184 | LLMediaImplQuickTime | 178 | media_plugin_gstreamer010 |
185 | </impl> | 179 | </impl> |
186 | </mimetype> | 180 | </mimetype> |
187 | <mimetype name="application/javascript"> | 181 | <mimetype name="application/javascript"> |
@@ -191,6 +185,9 @@ | |||
191 | <widgettype> | 185 | <widgettype> |
192 | web | 186 | web |
193 | </widgettype> | 187 | </widgettype> |
188 | <impl> | ||
189 | media_plugin_webkit | ||
190 | </impl> | ||
194 | </mimetype> | 191 | </mimetype> |
195 | <mimetype name="application/ogg"> | 192 | <mimetype name="application/ogg"> |
196 | <label name="application/ogg_label"> | 193 | <label name="application/ogg_label"> |
@@ -199,6 +196,9 @@ | |||
199 | <widgettype> | 196 | <widgettype> |
200 | audio | 197 | audio |
201 | </widgettype> | 198 | </widgettype> |
199 | <impl> | ||
200 | media_plugin_gstreamer010 | ||
201 | </impl> | ||
202 | </mimetype> | 202 | </mimetype> |
203 | <mimetype name="application/pdf"> | 203 | <mimetype name="application/pdf"> |
204 | <label name="application/pdf_label"> | 204 | <label name="application/pdf_label"> |
@@ -207,6 +207,9 @@ | |||
207 | <widgettype> | 207 | <widgettype> |
208 | image | 208 | image |
209 | </widgettype> | 209 | </widgettype> |
210 | <impl> | ||
211 | media_plugin_webkit | ||
212 | </impl> | ||
210 | </mimetype> | 213 | </mimetype> |
211 | <mimetype name="application/postscript"> | 214 | <mimetype name="application/postscript"> |
212 | <label name="application/postscript_label"> | 215 | <label name="application/postscript_label"> |
@@ -215,6 +218,9 @@ | |||
215 | <widgettype> | 218 | <widgettype> |
216 | image | 219 | image |
217 | </widgettype> | 220 | </widgettype> |
221 | <impl> | ||
222 | media_plugin_webkit | ||
223 | </impl> | ||
218 | </mimetype> | 224 | </mimetype> |
219 | <mimetype name="application/rtf"> | 225 | <mimetype name="application/rtf"> |
220 | <label name="application/rtf_label"> | 226 | <label name="application/rtf_label"> |
@@ -223,14 +229,20 @@ | |||
223 | <widgettype> | 229 | <widgettype> |
224 | image | 230 | image |
225 | </widgettype> | 231 | </widgettype> |
232 | <impl> | ||
233 | media_plugin_webkit | ||
234 | </impl> | ||
226 | </mimetype> | 235 | </mimetype> |
227 | <mimetype name="application/smil"> | 236 | <mimetype name="application/smil"> |
228 | <label name="application/smil_label"> | 237 | <label name="application/smil_label"> |
229 | Synchronized Multimedia Integration Language (SMIL) | 238 | Synchronized Multimedia Integration Language (SMIL) |
230 | </label> | 239 | </label> |
231 | <widgettype> | 240 | <widgettype> |
232 | movie | 241 | movie |
233 | </widgettype> | 242 | </widgettype> |
243 | <impl> | ||
244 | media_plugin_webkit | ||
245 | </impl> | ||
234 | </mimetype> | 246 | </mimetype> |
235 | <mimetype name="application/xhtml+xml"> | 247 | <mimetype name="application/xhtml+xml"> |
236 | <label name="application/xhtml+xml_label"> | 248 | <label name="application/xhtml+xml_label"> |
@@ -239,6 +251,9 @@ | |||
239 | <widgettype> | 251 | <widgettype> |
240 | web | 252 | web |
241 | </widgettype> | 253 | </widgettype> |
254 | <impl> | ||
255 | media_plugin_webkit | ||
256 | </impl> | ||
242 | </mimetype> | 257 | </mimetype> |
243 | <mimetype name="application/x-director"> | 258 | <mimetype name="application/x-director"> |
244 | <label name="application/x-director_label"> | 259 | <label name="application/x-director_label"> |
@@ -247,14 +262,9 @@ | |||
247 | <widgettype> | 262 | <widgettype> |
248 | image | 263 | image |
249 | </widgettype> | 264 | </widgettype> |
250 | </mimetype> | 265 | <impl> |
251 | <mimetype name="application/x-shockwave-flash"> | 266 | media_plugin_webkit |
252 | <label name="application/x-shockwave-flash_label"> | 267 | </impl> |
253 | Flash | ||
254 | </label> | ||
255 | <widgettype> | ||
256 | image | ||
257 | </widgettype> | ||
258 | </mimetype> | 268 | </mimetype> |
259 | <mimetype name="audio/mid"> | 269 | <mimetype name="audio/mid"> |
260 | <label name="audio/mid_label"> | 270 | <label name="audio/mid_label"> |
@@ -263,6 +273,9 @@ | |||
263 | <widgettype> | 273 | <widgettype> |
264 | audio | 274 | audio |
265 | </widgettype> | 275 | </widgettype> |
276 | <impl> | ||
277 | media_plugin_gstreamer010 | ||
278 | </impl> | ||
266 | </mimetype> | 279 | </mimetype> |
267 | <mimetype name="audio/mpeg"> | 280 | <mimetype name="audio/mpeg"> |
268 | <label name="audio/mpeg_label"> | 281 | <label name="audio/mpeg_label"> |
@@ -271,6 +284,9 @@ | |||
271 | <widgettype> | 284 | <widgettype> |
272 | audio | 285 | audio |
273 | </widgettype> | 286 | </widgettype> |
287 | <impl> | ||
288 | media_plugin_gstreamer010 | ||
289 | </impl> | ||
274 | </mimetype> | 290 | </mimetype> |
275 | <mimetype name="audio/x-aiff"> | 291 | <mimetype name="audio/x-aiff"> |
276 | <label name="audio/x-aiff_label"> | 292 | <label name="audio/x-aiff_label"> |
@@ -279,6 +295,9 @@ | |||
279 | <widgettype> | 295 | <widgettype> |
280 | audio | 296 | audio |
281 | </widgettype> | 297 | </widgettype> |
298 | <impl> | ||
299 | media_plugin_gstreamer010 | ||
300 | </impl> | ||
282 | </mimetype> | 301 | </mimetype> |
283 | <mimetype name="audio/x-wav"> | 302 | <mimetype name="audio/x-wav"> |
284 | <label name="audio/x-wav_label"> | 303 | <label name="audio/x-wav_label"> |
@@ -287,6 +306,9 @@ | |||
287 | <widgettype> | 306 | <widgettype> |
288 | audio | 307 | audio |
289 | </widgettype> | 308 | </widgettype> |
309 | <impl> | ||
310 | media_plugin_gstreamer010 | ||
311 | </impl> | ||
290 | </mimetype> | 312 | </mimetype> |
291 | <mimetype menu="1" name="image/bmp"> | 313 | <mimetype menu="1" name="image/bmp"> |
292 | <label name="image/bmp_label"> | 314 | <label name="image/bmp_label"> |
@@ -296,7 +318,7 @@ | |||
296 | image | 318 | image |
297 | </widgettype> | 319 | </widgettype> |
298 | <impl> | 320 | <impl> |
299 | LLMediaImplLLMozLib | 321 | media_plugin_webkit |
300 | </impl> | 322 | </impl> |
301 | </mimetype> | 323 | </mimetype> |
302 | <mimetype menu="1" name="image/gif"> | 324 | <mimetype menu="1" name="image/gif"> |
@@ -307,7 +329,7 @@ | |||
307 | image | 329 | image |
308 | </widgettype> | 330 | </widgettype> |
309 | <impl> | 331 | <impl> |
310 | LLMediaImplLLMozLib | 332 | media_plugin_webkit |
311 | </impl> | 333 | </impl> |
312 | </mimetype> | 334 | </mimetype> |
313 | <mimetype menu="1" name="image/jpeg"> | 335 | <mimetype menu="1" name="image/jpeg"> |
@@ -318,7 +340,7 @@ | |||
318 | image | 340 | image |
319 | </widgettype> | 341 | </widgettype> |
320 | <impl> | 342 | <impl> |
321 | LLMediaImplLLMozLib | 343 | media_plugin_webkit |
322 | </impl> | 344 | </impl> |
323 | </mimetype> | 345 | </mimetype> |
324 | <mimetype menu="1" name="image/png"> | 346 | <mimetype menu="1" name="image/png"> |
@@ -329,7 +351,7 @@ | |||
329 | image | 351 | image |
330 | </widgettype> | 352 | </widgettype> |
331 | <impl> | 353 | <impl> |
332 | LLMediaImplLLMozLib | 354 | media_plugin_webkit |
333 | </impl> | 355 | </impl> |
334 | </mimetype> | 356 | </mimetype> |
335 | <mimetype name="image/svg+xml"> | 357 | <mimetype name="image/svg+xml"> |
@@ -340,7 +362,7 @@ | |||
340 | image | 362 | image |
341 | </widgettype> | 363 | </widgettype> |
342 | <impl> | 364 | <impl> |
343 | LLMediaImplLLMozLib | 365 | media_plugin_webkit |
344 | </impl> | 366 | </impl> |
345 | </mimetype> | 367 | </mimetype> |
346 | <mimetype menu="1" name="image/tiff"> | 368 | <mimetype menu="1" name="image/tiff"> |
@@ -351,7 +373,7 @@ | |||
351 | image | 373 | image |
352 | </widgettype> | 374 | </widgettype> |
353 | <impl> | 375 | <impl> |
354 | LLMediaImplLLMozLib | 376 | media_plugin_webkit |
355 | </impl> | 377 | </impl> |
356 | </mimetype> | 378 | </mimetype> |
357 | <mimetype menu="1" name="text/html"> | 379 | <mimetype menu="1" name="text/html"> |
@@ -362,7 +384,7 @@ | |||
362 | web | 384 | web |
363 | </widgettype> | 385 | </widgettype> |
364 | <impl> | 386 | <impl> |
365 | LLMediaImplLLMozLib | 387 | media_plugin_webkit |
366 | </impl> | 388 | </impl> |
367 | </mimetype> | 389 | </mimetype> |
368 | <mimetype menu="1" name="text/plain"> | 390 | <mimetype menu="1" name="text/plain"> |
@@ -373,7 +395,7 @@ | |||
373 | text | 395 | text |
374 | </widgettype> | 396 | </widgettype> |
375 | <impl> | 397 | <impl> |
376 | LLMediaImplLLMozLib | 398 | media_plugin_webkit |
377 | </impl> | 399 | </impl> |
378 | </mimetype> | 400 | </mimetype> |
379 | <mimetype name="text/xml"> | 401 | <mimetype name="text/xml"> |
@@ -384,7 +406,7 @@ | |||
384 | text | 406 | text |
385 | </widgettype> | 407 | </widgettype> |
386 | <impl> | 408 | <impl> |
387 | LLMediaImplLLMozLib | 409 | media_plugin_webkit |
388 | </impl> | 410 | </impl> |
389 | </mimetype> | 411 | </mimetype> |
390 | <mimetype menu="1" name="video/mpeg"> | 412 | <mimetype menu="1" name="video/mpeg"> |
@@ -395,7 +417,7 @@ | |||
395 | movie | 417 | movie |
396 | </widgettype> | 418 | </widgettype> |
397 | <impl> | 419 | <impl> |
398 | LLMediaImplQuickTime | 420 | media_plugin_gstreamer010 |
399 | </impl> | 421 | </impl> |
400 | </mimetype> | 422 | </mimetype> |
401 | <mimetype name="video/mp4"> | 423 | <mimetype name="video/mp4"> |
@@ -406,18 +428,18 @@ | |||
406 | movie | 428 | movie |
407 | </widgettype> | 429 | </widgettype> |
408 | <impl> | 430 | <impl> |
409 | LLMediaImplQuickTime | 431 | media_plugin_gstreamer010 |
410 | </impl> | 432 | </impl> |
411 | </mimetype> | 433 | </mimetype> |
412 | <mimetype menu="1" name="video/quicktime"> | 434 | <mimetype menu="1" name="video/gstreamer"> |
413 | <label name="video/quicktime_label"> | 435 | <label name="video/gstreamer_label"> |
414 | Movie (QuickTime) | 436 | Movie (gstreamer) |
415 | </label> | 437 | </label> |
416 | <widgettype> | 438 | <widgettype> |
417 | movie | 439 | movie |
418 | </widgettype> | 440 | </widgettype> |
419 | <impl> | 441 | <impl> |
420 | LLMediaImplQuickTime | 442 | media_plugin_gstreamer010 |
421 | </impl> | 443 | </impl> |
422 | </mimetype> | 444 | </mimetype> |
423 | <mimetype name="video/x-ms-asf"> | 445 | <mimetype name="video/x-ms-asf"> |
@@ -428,7 +450,7 @@ | |||
428 | movie | 450 | movie |
429 | </widgettype> | 451 | </widgettype> |
430 | <impl> | 452 | <impl> |
431 | LLMediaImplQuickTime | 453 | media_plugin_gstreamer010 |
432 | </impl> | 454 | </impl> |
433 | </mimetype> | 455 | </mimetype> |
434 | <mimetype name="video/x-ms-wmv"> | 456 | <mimetype name="video/x-ms-wmv"> |
@@ -439,7 +461,7 @@ | |||
439 | movie | 461 | movie |
440 | </widgettype> | 462 | </widgettype> |
441 | <impl> | 463 | <impl> |
442 | LLMediaImplQuickTime | 464 | media_plugin_gstreamer010 |
443 | </impl> | 465 | </impl> |
444 | </mimetype> | 466 | </mimetype> |
445 | <mimetype menu="1" name="video/x-msvideo"> | 467 | <mimetype menu="1" name="video/x-msvideo"> |
@@ -450,7 +472,7 @@ | |||
450 | movie | 472 | movie |
451 | </widgettype> | 473 | </widgettype> |
452 | <impl> | 474 | <impl> |
453 | LLMediaImplQuickTime | 475 | media_plugin_gstreamer010 |
454 | </impl> | 476 | </impl> |
455 | </mimetype> | 477 | </mimetype> |
456 | </mimetypes> | 478 | </mimetypes> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml new file mode 100755 index 0000000..e95b371 --- /dev/null +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml | |||
@@ -0,0 +1,478 @@ | |||
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_gstreamer | ||
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_webkit | ||
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 | <impl> | ||
134 | media_plugin_webkit | ||
135 | </impl> | ||
136 | </mimetype> | ||
137 | <mimetype name="audio/*"> | ||
138 | <label name="audio2_label"> | ||
139 | Audio | ||
140 | </label> | ||
141 | <widgettype> | ||
142 | audio | ||
143 | </widgettype> | ||
144 | <impl> | ||
145 | media_plugin_gstreamer | ||
146 | </impl> | ||
147 | </mimetype> | ||
148 | <mimetype name="video/*"> | ||
149 | <label name="video2_label"> | ||
150 | Video | ||
151 | </label> | ||
152 | <widgettype> | ||
153 | movie | ||
154 | </widgettype> | ||
155 | <impl> | ||
156 | media_plugin_gstreamer | ||
157 | </impl> | ||
158 | </mimetype> | ||
159 | <mimetype name="image/*"> | ||
160 | <label name="image2_label"> | ||
161 | Image | ||
162 | </label> | ||
163 | <widgettype> | ||
164 | image | ||
165 | </widgettype> | ||
166 | <impl> | ||
167 | media_plugin_webkit | ||
168 | </impl> | ||
169 | </mimetype> | ||
170 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | ||
171 | <label name="vnd.secondlife.qt.legacy_label"> | ||
172 | Movie (QuickTime) | ||
173 | </label> | ||
174 | <widgettype> | ||
175 | movie | ||
176 | </widgettype> | ||
177 | <impl> | ||
178 | media_plugin_gstreamer | ||
179 | </impl> | ||
180 | </mimetype> | ||
181 | <mimetype name="application/javascript"> | ||
182 | <label name="application/javascript_label"> | ||
183 | Javascript | ||
184 | </label> | ||
185 | <widgettype> | ||
186 | web | ||
187 | </widgettype> | ||
188 | <impl> | ||
189 | media_plugin_webkit | ||
190 | </impl> | ||
191 | </mimetype> | ||
192 | <mimetype name="application/ogg"> | ||
193 | <label name="application/ogg_label"> | ||
194 | Ogg Audio/Video | ||
195 | </label> | ||
196 | <widgettype> | ||
197 | audio | ||
198 | </widgettype> | ||
199 | <impl> | ||
200 | media_plugin_gstreamer | ||
201 | </impl> | ||
202 | </mimetype> | ||
203 | <mimetype name="application/pdf"> | ||
204 | <label name="application/pdf_label"> | ||
205 | PDF Document | ||
206 | </label> | ||
207 | <widgettype> | ||
208 | image | ||
209 | </widgettype> | ||
210 | <impl> | ||
211 | media_plugin_webkit | ||
212 | </impl> | ||
213 | </mimetype> | ||
214 | <mimetype name="application/postscript"> | ||
215 | <label name="application/postscript_label"> | ||
216 | Postscript Document | ||
217 | </label> | ||
218 | <widgettype> | ||
219 | image | ||
220 | </widgettype> | ||
221 | <impl> | ||
222 | media_plugin_webkit | ||
223 | </impl> | ||
224 | </mimetype> | ||
225 | <mimetype name="application/rtf"> | ||
226 | <label name="application/rtf_label"> | ||
227 | Rich Text (RTF) | ||
228 | </label> | ||
229 | <widgettype> | ||
230 | image | ||
231 | </widgettype> | ||
232 | <impl> | ||
233 | media_plugin_webkit | ||
234 | </impl> | ||
235 | </mimetype> | ||
236 | <mimetype name="application/smil"> | ||
237 | <label name="application/smil_label"> | ||
238 | Synchronized Multimedia Integration Language (SMIL) | ||
239 | </label> | ||
240 | <widgettype> | ||
241 | movie | ||
242 | </widgettype> | ||
243 | <impl> | ||
244 | media_plugin_webkit | ||
245 | </impl> | ||
246 | </mimetype> | ||
247 | <mimetype name="application/xhtml+xml"> | ||
248 | <label name="application/xhtml+xml_label"> | ||
249 | Web Page (XHTML) | ||
250 | </label> | ||
251 | <widgettype> | ||
252 | web | ||
253 | </widgettype> | ||
254 | <impl> | ||
255 | media_plugin_webkit | ||
256 | </impl> | ||
257 | </mimetype> | ||
258 | <mimetype name="application/x-director"> | ||
259 | <label name="application/x-director_label"> | ||
260 | Macromedia Director | ||
261 | </label> | ||
262 | <widgettype> | ||
263 | image | ||
264 | </widgettype> | ||
265 | <impl> | ||
266 | media_plugin_webkit | ||
267 | </impl> | ||
268 | </mimetype> | ||
269 | <mimetype name="audio/mid"> | ||
270 | <label name="audio/mid_label"> | ||
271 | Audio (MIDI) | ||
272 | </label> | ||
273 | <widgettype> | ||
274 | audio | ||
275 | </widgettype> | ||
276 | <impl> | ||
277 | media_plugin_gstreamer | ||
278 | </impl> | ||
279 | </mimetype> | ||
280 | <mimetype name="audio/mpeg"> | ||
281 | <label name="audio/mpeg_label"> | ||
282 | Audio (MP3) | ||
283 | </label> | ||
284 | <widgettype> | ||
285 | audio | ||
286 | </widgettype> | ||
287 | <impl> | ||
288 | media_plugin_gstreamer | ||
289 | </impl> | ||
290 | </mimetype> | ||
291 | <mimetype name="audio/x-aiff"> | ||
292 | <label name="audio/x-aiff_label"> | ||
293 | Audio (AIFF) | ||
294 | </label> | ||
295 | <widgettype> | ||
296 | audio | ||
297 | </widgettype> | ||
298 | <impl> | ||
299 | media_plugin_gstreamer | ||
300 | </impl> | ||
301 | </mimetype> | ||
302 | <mimetype name="audio/x-wav"> | ||
303 | <label name="audio/x-wav_label"> | ||
304 | Audio (WAV) | ||
305 | </label> | ||
306 | <widgettype> | ||
307 | audio | ||
308 | </widgettype> | ||
309 | <impl> | ||
310 | media_plugin_gstreamer | ||
311 | </impl> | ||
312 | </mimetype> | ||
313 | <mimetype menu="1" name="image/bmp"> | ||
314 | <label name="image/bmp_label"> | ||
315 | Image (BMP) | ||
316 | </label> | ||
317 | <widgettype> | ||
318 | image | ||
319 | </widgettype> | ||
320 | <impl> | ||
321 | media_plugin_webkit | ||
322 | </impl> | ||
323 | </mimetype> | ||
324 | <mimetype menu="1" name="image/gif"> | ||
325 | <label name="image/gif_label"> | ||
326 | Image (GIF) | ||
327 | </label> | ||
328 | <widgettype> | ||
329 | image | ||
330 | </widgettype> | ||
331 | <impl> | ||
332 | media_plugin_webkit | ||
333 | </impl> | ||
334 | </mimetype> | ||
335 | <mimetype menu="1" name="image/jpeg"> | ||
336 | <label name="image/jpeg_label"> | ||
337 | Image (JPEG) | ||
338 | </label> | ||
339 | <widgettype> | ||
340 | image | ||
341 | </widgettype> | ||
342 | <impl> | ||
343 | media_plugin_webkit | ||
344 | </impl> | ||
345 | </mimetype> | ||
346 | <mimetype menu="1" name="image/png"> | ||
347 | <label name="image/png_label"> | ||
348 | Image (PNG) | ||
349 | </label> | ||
350 | <widgettype> | ||
351 | image | ||
352 | </widgettype> | ||
353 | <impl> | ||
354 | media_plugin_webkit | ||
355 | </impl> | ||
356 | </mimetype> | ||
357 | <mimetype name="image/svg+xml"> | ||
358 | <label name="image/svg+xml_label"> | ||
359 | Image (SVG) | ||
360 | </label> | ||
361 | <widgettype> | ||
362 | image | ||
363 | </widgettype> | ||
364 | <impl> | ||
365 | media_plugin_webkit | ||
366 | </impl> | ||
367 | </mimetype> | ||
368 | <mimetype menu="1" name="image/tiff"> | ||
369 | <label name="image/tiff_label"> | ||
370 | Image (TIFF) | ||
371 | </label> | ||
372 | <widgettype> | ||
373 | image | ||
374 | </widgettype> | ||
375 | <impl> | ||
376 | media_plugin_webkit | ||
377 | </impl> | ||
378 | </mimetype> | ||
379 | <mimetype menu="1" name="text/html"> | ||
380 | <label name="text/html_label"> | ||
381 | Web Page | ||
382 | </label> | ||
383 | <widgettype> | ||
384 | web | ||
385 | </widgettype> | ||
386 | <impl> | ||
387 | media_plugin_webkit | ||
388 | </impl> | ||
389 | </mimetype> | ||
390 | <mimetype menu="1" name="text/plain"> | ||
391 | <label name="text/plain_label"> | ||
392 | Text | ||
393 | </label> | ||
394 | <widgettype> | ||
395 | text | ||
396 | </widgettype> | ||
397 | <impl> | ||
398 | media_plugin_webkit | ||
399 | </impl> | ||
400 | </mimetype> | ||
401 | <mimetype name="text/xml"> | ||
402 | <label name="text/xml_label"> | ||
403 | XML | ||
404 | </label> | ||
405 | <widgettype> | ||
406 | text | ||
407 | </widgettype> | ||
408 | <impl> | ||
409 | media_plugin_webkit | ||
410 | </impl> | ||
411 | </mimetype> | ||
412 | <mimetype menu="1" name="video/mpeg"> | ||
413 | <label name="video/mpeg_label"> | ||
414 | Movie (MPEG) | ||
415 | </label> | ||
416 | <widgettype> | ||
417 | movie | ||
418 | </widgettype> | ||
419 | <impl> | ||
420 | media_plugin_gstreamer | ||
421 | </impl> | ||
422 | </mimetype> | ||
423 | <mimetype name="video/mp4"> | ||
424 | <label name="video/mp4_label"> | ||
425 | Movie (MP4) | ||
426 | </label> | ||
427 | <widgettype> | ||
428 | movie | ||
429 | </widgettype> | ||
430 | <impl> | ||
431 | media_plugin_gstreamer | ||
432 | </impl> | ||
433 | </mimetype> | ||
434 | <mimetype menu="1" name="video/quicktime"> | ||
435 | <label name="video/quicktime_label"> | ||
436 | Movie (QuickTime) | ||
437 | </label> | ||
438 | <widgettype> | ||
439 | movie | ||
440 | </widgettype> | ||
441 | <impl> | ||
442 | media_plugin_gstreamer | ||
443 | </impl> | ||
444 | </mimetype> | ||
445 | <mimetype name="video/x-ms-asf"> | ||
446 | <label name="video/x-ms-asf_label"> | ||
447 | Movie (Windows Media ASF) | ||
448 | </label> | ||
449 | <widgettype> | ||
450 | movie | ||
451 | </widgettype> | ||
452 | <impl> | ||
453 | media_plugin_gstreamer | ||
454 | </impl> | ||
455 | </mimetype> | ||
456 | <mimetype name="video/x-ms-wmv"> | ||
457 | <label name="video/x-ms-wmv_label"> | ||
458 | Movie (Windows Media WMV) | ||
459 | </label> | ||
460 | <widgettype> | ||
461 | movie | ||
462 | </widgettype> | ||
463 | <impl> | ||
464 | media_plugin_gstreamer | ||
465 | </impl> | ||
466 | </mimetype> | ||
467 | <mimetype menu="1" name="video/x-msvideo"> | ||
468 | <label name="video/x-msvideo_label"> | ||
469 | Movie (AVI) | ||
470 | </label> | ||
471 | <widgettype> | ||
472 | movie | ||
473 | </widgettype> | ||
474 | <impl> | ||
475 | media_plugin_gstreamer | ||
476 | </impl> | ||
477 | </mimetype> | ||
478 | </mimetypes> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml new file mode 100755 index 0000000..7931e55 --- /dev/null +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml | |||
@@ -0,0 +1,478 @@ | |||
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 | <impl> | ||
134 | media_plugin_webkit | ||
135 | </impl> | ||
136 | </mimetype> | ||
137 | <mimetype name="audio/*"> | ||
138 | <label name="audio2_label"> | ||
139 | Audio | ||
140 | </label> | ||
141 | <widgettype> | ||
142 | audio | ||
143 | </widgettype> | ||
144 | <impl> | ||
145 | media_plugin_quicktime | ||
146 | </impl> | ||
147 | </mimetype> | ||
148 | <mimetype name="video/*"> | ||
149 | <label name="video2_label"> | ||
150 | Video | ||
151 | </label> | ||
152 | <widgettype> | ||
153 | movie | ||
154 | </widgettype> | ||
155 | <impl> | ||
156 | media_plugin_quicktime | ||
157 | </impl> | ||
158 | </mimetype> | ||
159 | <mimetype name="image/*"> | ||
160 | <label name="image2_label"> | ||
161 | Image | ||
162 | </label> | ||
163 | <widgettype> | ||
164 | image | ||
165 | </widgettype> | ||
166 | <impl> | ||
167 | media_plugin_webkit | ||
168 | </impl> | ||
169 | </mimetype> | ||
170 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | ||
171 | <label name="vnd.secondlife.qt.legacy_label"> | ||
172 | Movie (QuickTime) | ||
173 | </label> | ||
174 | <widgettype> | ||
175 | movie | ||
176 | </widgettype> | ||
177 | <impl> | ||
178 | media_plugin_quicktime | ||
179 | </impl> | ||
180 | </mimetype> | ||
181 | <mimetype name="application/javascript"> | ||
182 | <label name="application/javascript_label"> | ||
183 | Javascript | ||
184 | </label> | ||
185 | <widgettype> | ||
186 | web | ||
187 | </widgettype> | ||
188 | <impl> | ||
189 | media_plugin_webkit | ||
190 | </impl> | ||
191 | </mimetype> | ||
192 | <mimetype name="application/ogg"> | ||
193 | <label name="application/ogg_label"> | ||
194 | Ogg Audio/Video | ||
195 | </label> | ||
196 | <widgettype> | ||
197 | audio | ||
198 | </widgettype> | ||
199 | <impl> | ||
200 | media_plugin_quicktime | ||
201 | </impl> | ||
202 | </mimetype> | ||
203 | <mimetype name="application/pdf"> | ||
204 | <label name="application/pdf_label"> | ||
205 | PDF Document | ||
206 | </label> | ||
207 | <widgettype> | ||
208 | image | ||
209 | </widgettype> | ||
210 | <impl> | ||
211 | media_plugin_webkit | ||
212 | </impl> | ||
213 | </mimetype> | ||
214 | <mimetype name="application/postscript"> | ||
215 | <label name="application/postscript_label"> | ||
216 | Postscript Document | ||
217 | </label> | ||
218 | <widgettype> | ||
219 | image | ||
220 | </widgettype> | ||
221 | <impl> | ||
222 | media_plugin_webkit | ||
223 | </impl> | ||
224 | </mimetype> | ||
225 | <mimetype name="application/rtf"> | ||
226 | <label name="application/rtf_label"> | ||
227 | Rich Text (RTF) | ||
228 | </label> | ||
229 | <widgettype> | ||
230 | image | ||
231 | </widgettype> | ||
232 | <impl> | ||
233 | media_plugin_webkit | ||
234 | </impl> | ||
235 | </mimetype> | ||
236 | <mimetype name="application/smil"> | ||
237 | <label name="application/smil_label"> | ||
238 | Synchronized Multimedia Integration Language (SMIL) | ||
239 | </label> | ||
240 | <widgettype> | ||
241 | movie | ||
242 | </widgettype> | ||
243 | <impl> | ||
244 | media_plugin_webkit | ||
245 | </impl> | ||
246 | </mimetype> | ||
247 | <mimetype name="application/xhtml+xml"> | ||
248 | <label name="application/xhtml+xml_label"> | ||
249 | Web Page (XHTML) | ||
250 | </label> | ||
251 | <widgettype> | ||
252 | web | ||
253 | </widgettype> | ||
254 | <impl> | ||
255 | media_plugin_webkit | ||
256 | </impl> | ||
257 | </mimetype> | ||
258 | <mimetype name="application/x-director"> | ||
259 | <label name="application/x-director_label"> | ||
260 | Macromedia Director | ||
261 | </label> | ||
262 | <widgettype> | ||
263 | image | ||
264 | </widgettype> | ||
265 | <impl> | ||
266 | media_plugin_webkit | ||
267 | </impl> | ||
268 | </mimetype> | ||
269 | <mimetype name="audio/mid"> | ||
270 | <label name="audio/mid_label"> | ||
271 | Audio (MIDI) | ||
272 | </label> | ||
273 | <widgettype> | ||
274 | audio | ||
275 | </widgettype> | ||
276 | <impl> | ||
277 | media_plugin_quicktime | ||
278 | </impl> | ||
279 | </mimetype> | ||
280 | <mimetype name="audio/mpeg"> | ||
281 | <label name="audio/mpeg_label"> | ||
282 | Audio (MP3) | ||
283 | </label> | ||
284 | <widgettype> | ||
285 | audio | ||
286 | </widgettype> | ||
287 | <impl> | ||
288 | media_plugin_quicktime | ||
289 | </impl> | ||
290 | </mimetype> | ||
291 | <mimetype name="audio/x-aiff"> | ||
292 | <label name="audio/x-aiff_label"> | ||
293 | Audio (AIFF) | ||
294 | </label> | ||
295 | <widgettype> | ||
296 | audio | ||
297 | </widgettype> | ||
298 | <impl> | ||
299 | media_plugin_quicktime | ||
300 | </impl> | ||
301 | </mimetype> | ||
302 | <mimetype name="audio/x-wav"> | ||
303 | <label name="audio/x-wav_label"> | ||
304 | Audio (WAV) | ||
305 | </label> | ||
306 | <widgettype> | ||
307 | audio | ||
308 | </widgettype> | ||
309 | <impl> | ||
310 | media_plugin_quicktime | ||
311 | </impl> | ||
312 | </mimetype> | ||
313 | <mimetype menu="1" name="image/bmp"> | ||
314 | <label name="image/bmp_label"> | ||
315 | Image (BMP) | ||
316 | </label> | ||
317 | <widgettype> | ||
318 | image | ||
319 | </widgettype> | ||
320 | <impl> | ||
321 | media_plugin_webkit | ||
322 | </impl> | ||
323 | </mimetype> | ||
324 | <mimetype menu="1" name="image/gif"> | ||
325 | <label name="image/gif_label"> | ||
326 | Image (GIF) | ||
327 | </label> | ||
328 | <widgettype> | ||
329 | image | ||
330 | </widgettype> | ||
331 | <impl> | ||
332 | media_plugin_webkit | ||
333 | </impl> | ||
334 | </mimetype> | ||
335 | <mimetype menu="1" name="image/jpeg"> | ||
336 | <label name="image/jpeg_label"> | ||
337 | Image (JPEG) | ||
338 | </label> | ||
339 | <widgettype> | ||
340 | image | ||
341 | </widgettype> | ||
342 | <impl> | ||
343 | media_plugin_webkit | ||
344 | </impl> | ||
345 | </mimetype> | ||
346 | <mimetype menu="1" name="image/png"> | ||
347 | <label name="image/png_label"> | ||
348 | Image (PNG) | ||
349 | </label> | ||
350 | <widgettype> | ||
351 | image | ||
352 | </widgettype> | ||
353 | <impl> | ||
354 | media_plugin_webkit | ||
355 | </impl> | ||
356 | </mimetype> | ||
357 | <mimetype name="image/svg+xml"> | ||
358 | <label name="image/svg+xml_label"> | ||
359 | Image (SVG) | ||
360 | </label> | ||
361 | <widgettype> | ||
362 | image | ||
363 | </widgettype> | ||
364 | <impl> | ||
365 | media_plugin_webkit | ||
366 | </impl> | ||
367 | </mimetype> | ||
368 | <mimetype menu="1" name="image/tiff"> | ||
369 | <label name="image/tiff_label"> | ||
370 | Image (TIFF) | ||
371 | </label> | ||
372 | <widgettype> | ||
373 | image | ||
374 | </widgettype> | ||
375 | <impl> | ||
376 | media_plugin_webkit | ||
377 | </impl> | ||
378 | </mimetype> | ||
379 | <mimetype menu="1" name="text/html"> | ||
380 | <label name="text/html_label"> | ||
381 | Web Page | ||
382 | </label> | ||
383 | <widgettype> | ||
384 | web | ||
385 | </widgettype> | ||
386 | <impl> | ||
387 | media_plugin_webkit | ||
388 | </impl> | ||
389 | </mimetype> | ||
390 | <mimetype menu="1" name="text/plain"> | ||
391 | <label name="text/plain_label"> | ||
392 | Text | ||
393 | </label> | ||
394 | <widgettype> | ||
395 | text | ||
396 | </widgettype> | ||
397 | <impl> | ||
398 | media_plugin_webkit | ||
399 | </impl> | ||
400 | </mimetype> | ||
401 | <mimetype name="text/xml"> | ||
402 | <label name="text/xml_label"> | ||
403 | XML | ||
404 | </label> | ||
405 | <widgettype> | ||
406 | text | ||
407 | </widgettype> | ||
408 | <impl> | ||
409 | media_plugin_webkit | ||
410 | </impl> | ||
411 | </mimetype> | ||
412 | <mimetype menu="1" name="video/mpeg"> | ||
413 | <label name="video/mpeg_label"> | ||
414 | Movie (MPEG) | ||
415 | </label> | ||
416 | <widgettype> | ||
417 | movie | ||
418 | </widgettype> | ||
419 | <impl> | ||
420 | media_plugin_quicktime | ||
421 | </impl> | ||
422 | </mimetype> | ||
423 | <mimetype name="video/mp4"> | ||
424 | <label name="video/mp4_label"> | ||
425 | Movie (MP4) | ||
426 | </label> | ||
427 | <widgettype> | ||
428 | movie | ||
429 | </widgettype> | ||
430 | <impl> | ||
431 | media_plugin_quicktime | ||
432 | </impl> | ||
433 | </mimetype> | ||
434 | <mimetype menu="1" name="video/quicktime"> | ||
435 | <label name="video/quicktime_label"> | ||
436 | Movie (QuickTime) | ||
437 | </label> | ||
438 | <widgettype> | ||
439 | movie | ||
440 | </widgettype> | ||
441 | <impl> | ||
442 | media_plugin_quicktime | ||
443 | </impl> | ||
444 | </mimetype> | ||
445 | <mimetype name="video/x-ms-asf"> | ||
446 | <label name="video/x-ms-asf_label"> | ||
447 | Movie (Windows Media ASF) | ||
448 | </label> | ||
449 | <widgettype> | ||
450 | movie | ||
451 | </widgettype> | ||
452 | <impl> | ||
453 | media_plugin_quicktime | ||
454 | </impl> | ||
455 | </mimetype> | ||
456 | <mimetype name="video/x-ms-wmv"> | ||
457 | <label name="video/x-ms-wmv_label"> | ||
458 | Movie (Windows Media WMV) | ||
459 | </label> | ||
460 | <widgettype> | ||
461 | movie | ||
462 | </widgettype> | ||
463 | <impl> | ||
464 | media_plugin_quicktime | ||
465 | </impl> | ||
466 | </mimetype> | ||
467 | <mimetype menu="1" name="video/x-msvideo"> | ||
468 | <label name="video/x-msvideo_label"> | ||
469 | Movie (AVI) | ||
470 | </label> | ||
471 | <widgettype> | ||
472 | movie | ||
473 | </widgettype> | ||
474 | <impl> | ||
475 | media_plugin_quicktime | ||
476 | </impl> | ||
477 | </mimetype> | ||
478 | </mimetypes> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml new file mode 100644 index 0000000..d4d47cb --- /dev/null +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml | |||
@@ -0,0 +1,445 @@ | |||
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_gstreamer | ||
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_gstreamer | ||
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 | </mimetype> | ||
142 | <mimetype name="video/*"> | ||
143 | <label name="video2_label"> | ||
144 | Video | ||
145 | </label> | ||
146 | <widgettype> | ||
147 | movie | ||
148 | </widgettype> | ||
149 | </mimetype> | ||
150 | <mimetype name="image/*"> | ||
151 | <label name="image2_label"> | ||
152 | Image | ||
153 | </label> | ||
154 | <widgettype> | ||
155 | image | ||
156 | </widgettype> | ||
157 | </mimetype> | ||
158 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | ||
159 | <label name="vnd.secondlife.qt.legacy_label"> | ||
160 | Movie (gstreamer) | ||
161 | </label> | ||
162 | <widgettype> | ||
163 | movie | ||
164 | </widgettype> | ||
165 | <impl> | ||
166 | media_plugin_gstreamer | ||
167 | </impl> | ||
168 | </mimetype> | ||
169 | <mimetype name="application/javascript"> | ||
170 | <label name="application/javascript_label"> | ||
171 | Javascript | ||
172 | </label> | ||
173 | <widgettype> | ||
174 | web | ||
175 | </widgettype> | ||
176 | </mimetype> | ||
177 | <mimetype name="application/ogg"> | ||
178 | <label name="application/ogg_label"> | ||
179 | Ogg Audio/Video | ||
180 | </label> | ||
181 | <widgettype> | ||
182 | audio | ||
183 | </widgettype> | ||
184 | </mimetype> | ||
185 | <mimetype name="application/pdf"> | ||
186 | <label name="application/pdf_label"> | ||
187 | PDF Document | ||
188 | </label> | ||
189 | <widgettype> | ||
190 | image | ||
191 | </widgettype> | ||
192 | </mimetype> | ||
193 | <mimetype name="application/postscript"> | ||
194 | <label name="application/postscript_label"> | ||
195 | Postscript Document | ||
196 | </label> | ||
197 | <widgettype> | ||
198 | image | ||
199 | </widgettype> | ||
200 | </mimetype> | ||
201 | <mimetype name="application/rtf"> | ||
202 | <label name="application/rtf_label"> | ||
203 | Rich Text (RTF) | ||
204 | </label> | ||
205 | <widgettype> | ||
206 | image | ||
207 | </widgettype> | ||
208 | </mimetype> | ||
209 | <mimetype name="application/smil"> | ||
210 | <label name="application/smil_label"> | ||
211 | Synchronized Multimedia Integration Language (SMIL) | ||
212 | </label> | ||
213 | <widgettype> | ||
214 | movie | ||
215 | </widgettype> | ||
216 | <impl> | ||
217 | media_plugin_gstreamer | ||
218 | </impl> | ||
219 | </mimetype> | ||
220 | <mimetype name="application/xhtml+xml"> | ||
221 | <label name="application/xhtml+xml_label"> | ||
222 | Web Page (XHTML) | ||
223 | </label> | ||
224 | <widgettype> | ||
225 | web | ||
226 | </widgettype> | ||
227 | </mimetype> | ||
228 | <mimetype name="application/x-director"> | ||
229 | <label name="application/x-director_label"> | ||
230 | Macromedia Director | ||
231 | </label> | ||
232 | <widgettype> | ||
233 | image | ||
234 | </widgettype> | ||
235 | </mimetype> | ||
236 | <mimetype name="audio/mid"> | ||
237 | <label name="audio/mid_label"> | ||
238 | Audio (MIDI) | ||
239 | </label> | ||
240 | <widgettype> | ||
241 | audio | ||
242 | </widgettype> | ||
243 | <impl> | ||
244 | media_plugin_gstreamer | ||
245 | </impl> | ||
246 | </mimetype> | ||
247 | <mimetype name="audio/mpeg"> | ||
248 | <label name="audio/mpeg_label"> | ||
249 | Audio (MP3) | ||
250 | </label> | ||
251 | <widgettype> | ||
252 | audio | ||
253 | </widgettype> | ||
254 | <impl> | ||
255 | media_plugin_gstreamer | ||
256 | </impl> | ||
257 | </mimetype> | ||
258 | <mimetype name="audio/x-aiff"> | ||
259 | <label name="audio/x-aiff_label"> | ||
260 | Audio (AIFF) | ||
261 | </label> | ||
262 | <widgettype> | ||
263 | audio | ||
264 | </widgettype> | ||
265 | <impl> | ||
266 | media_plugin_gstreamer | ||
267 | </impl> | ||
268 | </mimetype> | ||
269 | <mimetype name="audio/x-wav"> | ||
270 | <label name="audio/x-wav_label"> | ||
271 | Audio (WAV) | ||
272 | </label> | ||
273 | <widgettype> | ||
274 | audio | ||
275 | </widgettype> | ||
276 | <impl> | ||
277 | media_plugin_gstreamer010 | ||
278 | </impl> | ||
279 | </mimetype> | ||
280 | <mimetype menu="1" name="image/bmp"> | ||
281 | <label name="image/bmp_label"> | ||
282 | Image (BMP) | ||
283 | </label> | ||
284 | <widgettype> | ||
285 | image | ||
286 | </widgettype> | ||
287 | <impl> | ||
288 | media_plugin_webkit | ||
289 | </impl> | ||
290 | </mimetype> | ||
291 | <mimetype menu="1" name="image/gif"> | ||
292 | <label name="image/gif_label"> | ||
293 | Image (GIF) | ||
294 | </label> | ||
295 | <widgettype> | ||
296 | image | ||
297 | </widgettype> | ||
298 | <impl> | ||
299 | media_plugin_webkit | ||
300 | </impl> | ||
301 | </mimetype> | ||
302 | <mimetype menu="1" name="image/jpeg"> | ||
303 | <label name="image/jpeg_label"> | ||
304 | Image (JPEG) | ||
305 | </label> | ||
306 | <widgettype> | ||
307 | image | ||
308 | </widgettype> | ||
309 | <impl> | ||
310 | media_plugin_webkit | ||
311 | </impl> | ||
312 | </mimetype> | ||
313 | <mimetype menu="1" name="image/png"> | ||
314 | <label name="image/png_label"> | ||
315 | Image (PNG) | ||
316 | </label> | ||
317 | <widgettype> | ||
318 | image | ||
319 | </widgettype> | ||
320 | <impl> | ||
321 | media_plugin_webkit | ||
322 | </impl> | ||
323 | </mimetype> | ||
324 | <mimetype name="image/svg+xml"> | ||
325 | <label name="image/svg+xml_label"> | ||
326 | Image (SVG) | ||
327 | </label> | ||
328 | <widgettype> | ||
329 | image | ||
330 | </widgettype> | ||
331 | <impl> | ||
332 | media_plugin_webkit | ||
333 | </impl> | ||
334 | </mimetype> | ||
335 | <mimetype menu="1" name="image/tiff"> | ||
336 | <label name="image/tiff_label"> | ||
337 | Image (TIFF) | ||
338 | </label> | ||
339 | <widgettype> | ||
340 | image | ||
341 | </widgettype> | ||
342 | <impl> | ||
343 | media_plugin_webkit | ||
344 | </impl> | ||
345 | </mimetype> | ||
346 | <mimetype menu="1" name="text/html"> | ||
347 | <label name="text/html_label"> | ||
348 | Web Page | ||
349 | </label> | ||
350 | <widgettype> | ||
351 | web | ||
352 | </widgettype> | ||
353 | <impl> | ||
354 | media_plugin_webkit | ||
355 | </impl> | ||
356 | </mimetype> | ||
357 | <mimetype menu="1" name="text/plain"> | ||
358 | <label name="text/plain_label"> | ||
359 | Text | ||
360 | </label> | ||
361 | <widgettype> | ||
362 | text | ||
363 | </widgettype> | ||
364 | <impl> | ||
365 | media_plugin_webkit | ||
366 | </impl> | ||
367 | </mimetype> | ||
368 | <mimetype name="text/xml"> | ||
369 | <label name="text/xml_label"> | ||
370 | XML | ||
371 | </label> | ||
372 | <widgettype> | ||
373 | text | ||
374 | </widgettype> | ||
375 | <impl> | ||
376 | media_plugin_webkit | ||
377 | </impl> | ||
378 | </mimetype> | ||
379 | <mimetype menu="1" name="video/mpeg"> | ||
380 | <label name="video/mpeg_label"> | ||
381 | Movie (MPEG) | ||
382 | </label> | ||
383 | <widgettype> | ||
384 | movie | ||
385 | </widgettype> | ||
386 | <impl> | ||
387 | media_plugin_gstreamer010010 | ||
388 | </impl> | ||
389 | </mimetype> | ||
390 | <mimetype name="video/mp4"> | ||
391 | <label name="video/mp4_label"> | ||
392 | Movie (MP4) | ||
393 | </label> | ||
394 | <widgettype> | ||
395 | movie | ||
396 | </widgettype> | ||
397 | <impl> | ||
398 | media_plugin_gstreamer010010 | ||
399 | </impl> | ||
400 | </mimetype> | ||
401 | <mimetype menu="1" name="video/gstreamer"> | ||
402 | <label name="video/gstreamer_label"> | ||
403 | Movie (gstreamer) | ||
404 | </label> | ||
405 | <widgettype> | ||
406 | movie | ||
407 | </widgettype> | ||
408 | <impl> | ||
409 | media_plugin_gstreamer010010 | ||
410 | </impl> | ||
411 | </mimetype> | ||
412 | <mimetype name="video/x-ms-asf"> | ||
413 | <label name="video/x-ms-asf_label"> | ||
414 | Movie (Windows Media ASF) | ||
415 | </label> | ||
416 | <widgettype> | ||
417 | movie | ||
418 | </widgettype> | ||
419 | <impl> | ||
420 | media_plugin_gstreamer010010 | ||
421 | </impl> | ||
422 | </mimetype> | ||
423 | <mimetype name="video/x-ms-wmv"> | ||
424 | <label name="video/x-ms-wmv_label"> | ||
425 | Movie (Windows Media WMV) | ||
426 | </label> | ||
427 | <widgettype> | ||
428 | movie | ||
429 | </widgettype> | ||
430 | <impl> | ||
431 | media_plugin_gstreamer010010 | ||
432 | </impl> | ||
433 | </mimetype> | ||
434 | <mimetype menu="1" name="video/x-msvideo"> | ||
435 | <label name="video/x-msvideo_label"> | ||
436 | Movie (AVI) | ||
437 | </label> | ||
438 | <widgettype> | ||
439 | movie | ||
440 | </widgettype> | ||
441 | <impl> | ||
442 | media_plugin_gstreamer010010 | ||
443 | </impl> | ||
444 | </mimetype> | ||
445 | </mimetypes> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index d7b078c..b439dba 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml | |||
@@ -5556,7 +5556,25 @@ Apple's QuickTime software does not appear to be installed on your system. | |||
5556 | 5556 | ||
5557 | If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. | 5557 | If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. |
5558 | </notification> | 5558 | </notification> |
5559 | <notification | ||
5560 | icon="notify.tga" | ||
5561 | name="NoPlugin" | ||
5562 | type="notify"> | ||
5563 | No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. | ||
5564 | </notification> | ||
5565 | <notification | ||
5566 | icon="alertmodal.tga" | ||
5567 | name="MediaPluginFailed" | ||
5568 | type="alertmodal"> | ||
5569 | The following Media Plugin has failed: | ||
5570 | [PLUGIN] | ||
5559 | 5571 | ||
5572 | Please re-install the plugin or contact the vendor if you continue to experience problems. | ||
5573 | <form name="form"> | ||
5574 | <ignore name="ignore" | ||
5575 | text="When a Media Plugin fails"/> | ||
5576 | </form> | ||
5577 | </notification> | ||
5560 | <notification | 5578 | <notification |
5561 | icon="notify.tga" | 5579 | icon="notify.tga" |
5562 | name="OwnedObjectsReturned" | 5580 | name="OwnedObjectsReturned" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml index 4a13604..aab98db 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml | |||
@@ -15,7 +15,4 @@ | |||
15 | <layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar" | 15 | <layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar" |
16 | use_bounding_rect="true" user_resize="false" width="1024" min_height="28" /> | 16 | use_bounding_rect="true" user_resize="false" width="1024" min_height="28" /> |
17 | </layout_stack> | 17 | </layout_stack> |
18 | <panel auto_resize="true" background_visible="false" bottom="50" | ||
19 | follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false" | ||
20 | name="hud" user_resize="false" width="1024" /> | ||
21 | </panel> | 18 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml b/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml new file mode 100644 index 0000000..95f8289 --- /dev/null +++ b/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml | |||
@@ -0,0 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <panel border="false" auto_resize="true" background_visible="false" bottom="50" | ||
3 | follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false" | ||
4 | name="hud" user_resize="false" width="1024" /> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml new file mode 100644 index 0000000..1c0781a --- /dev/null +++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml | |||
@@ -0,0 +1,68 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <panel border="false" follows="" height="160" visible="false" mouse_opaque="false" | ||
3 | label="" name="MediaHUD" width="208" background_visible="false" background_opaque="false" bg_alpha_color="1 1 1 0.0"> | ||
4 | <panel name="media_region" left="20" right="-20" bottom="35" top="-20" follows="left|right|top|bottom" visible="true" background_opaque="false" | ||
5 | mouse_opaque="false"/> | ||
6 | <!--icon name="bg_image" image_name="media_panel_hoverrectangle.png" visible="true" left="10" bottom="32" right="-10" top="-10" follows="left|right|top|bottom"/--> | ||
7 | <layout_stack orientation="horizontal" left="0" bottom="0" follows="left|right|bottom" visible="true" width="208" height="32"> | ||
8 | <layout_panel user_resize="false"/> | ||
9 | <layout_panel user_resize="false" auto_resize="false" width="210" min_width="208"> | ||
10 | <panel name="media_focused_controls" width="208" left="0" height="32" bottom="0" visible="true"> | ||
11 | <icon name="media_panel_transportcontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="99" scale_image="true" bottom="0"/> | ||
12 | <button name="back" label="" left="4" width="20" bottom="6" height="22" image_unselected="media_btn_back.png" | ||
13 | image_selected="media_btn_back.png" scale_image="true"/> | ||
14 | <icon name="media_panel_divider-1" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="20" | ||
15 | scale_image="false" bottom="5"/> | ||
16 | <button name="fwd" label="" left_delta="3" width="17" bottom_delta="0" height="22" image_unselected="media_btn_forward.png" | ||
17 | image_selected="media_btn_forward.png" scale_image="true"/> | ||
18 | <icon name="media_panel_divider-2" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="17" | ||
19 | scale_image="false" bottom="5"/> | ||
20 | <button name="home" label="" left_delta="3" width="22" bottom_delta="0" height="22" image_unselected="media_btn_home.png" | ||
21 | image_selected="media_btn_home.png" scale_image="true"/> | ||
22 | <button name="media_stop" label="" left_delta="0" width="22" bottom_delta="0" height="22" image_unselected="button_anim_stop.tga" | ||
23 | image_selected="button_anim_stop.tga" scale_image="true"/> | ||
24 | <icon name="media_panel_divider-3" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" | ||
25 | scale_image="false" bottom="5"/> | ||
26 | <button name="reload" label="" left_delta="3" width="22" bottom_delta="0" height="22" image_unselected="media_btn_reload.png" | ||
27 | image_selected="media_btn_reload.png" scale_image="true"/> | ||
28 | <button name="stop" label="" left_delta="0" width="22" bottom_delta="0" height="22" image_unselected="media_btn_stoploading.png" | ||
29 | image_selected="media_btn_stoploading.png" scale_image="true" visible="false"/> | ||
30 | <button name="play" label="" left_delta="0" width="22" bottom_delta="0" height="22" image_unselected="button_anim_play.tga" | ||
31 | image_selected="button_anim_play.tga" scale_image="true" visible="false"/> | ||
32 | <button name="pause" label="" left_delta="0" width="22" bottom_delta="0" height="22" image_unselected="button_anim_pause.tga" | ||
33 | image_selected="button_anim_pause.tga" scale_image="true" visible="false"/> | ||
34 | <icon name="media_panel_scrollbg" image_name="media_panel_scrollbg.png" visible="true" height="32" width="32" | ||
35 | scale_image="false" bottom="0" left="97"/> | ||
36 | <button name="scrollup" label="" left="109" width="8" bottom="20" height="8" image_unselected="media_btn_scrollup.png" | ||
37 | image_selected="media_btn_scrollup.png" scale_image="false"/> | ||
38 | <button name="scrollleft" label="" left="100" width="8" bottom="12" height="8" image_unselected="media_btn_scrollleft.png" | ||
39 | image_selected="media_btn_scrollleft.png" scale_image="false"/> | ||
40 | <button name="scrollright" label="" left="117" width="8" bottom="12" height="8" image_unselected="media_btn_scrollright.png" | ||
41 | image_selected="media_btn_scrollright.png" scale_image="false"/> | ||
42 | <button name="scrolldown" label="" left="109" width="8" bottom="4" height="8" image_unselected="media_btn_scrolldown.png" | ||
43 | image_selected="media_btn_scrolldown.png" scale_image="false"/> | ||
44 | <icon name="media_panel_metacontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="81" | ||
45 | scale_image="true" bottom="0" left="127"/> | ||
46 | <button name="zoom_frame" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" | ||
47 | image_selected="media_btn_optimalzoom.png" scale_image="true"/> | ||
48 | <icon name="media_panel_divider-4" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" | ||
49 | scale_image="false" bottom="5"/> | ||
50 | <button name="new_window" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" | ||
51 | image_selected="media_btn_newwindow.png" scale_image="true"/> | ||
52 | <icon name="media_panel_divider-5" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="24" | ||
53 | scale_image="false" bottom="5"/> | ||
54 | <button name="close" label="" left_delta="3" width="21" bottom_delta="1" height="22" image_unselected="media_btn_done.png" | ||
55 | image_selected="media_btn_done.png" scale_image="true"/> | ||
56 | </panel> | ||
57 | <panel name="media_hover_controls" width="57" left="74" height="32" bottom="0" visible="false"> | ||
58 | <icon name="media_panel_metacontrols_bg-hover" image_name="media_panel_bg.png" visible="true" height="32" width="57" scale_image="true" bottom="0" left="0"/> | ||
59 | <button name="zoom_frame_hover" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" image_selected="media_btn_optimalzoom.png" | ||
60 | scale_image="true"/> | ||
61 | <icon name="media_panel_divider" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" scale_image="false" bottom="5"/> | ||
62 | <button name="new_window_hover" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" image_selected="media_btn_newwindow.png" | ||
63 | scale_image="true"/> | ||
64 | </panel> | ||
65 | </layout_panel> | ||
66 | <layout_panel user_resize="false"/> | ||
67 | </layout_stack> | ||
68 | </panel> | ||