aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-02-24 23:10:48 -0700
committerMcCabe Maxsted2009-02-24 23:10:48 -0700
commit4b10d505ff65d150c3bd185e0ede8b5b89471be2 (patch)
tree4380b9d43555cb157cd6eba7559e623c38a756af
parentFixed crash in Top Scripts (diff)
downloadmeta-impy-4b10d505ff65d150c3bd185e0ede8b5b89471be2.zip
meta-impy-4b10d505ff65d150c3bd185e0ede8b5b89471be2.tar.gz
meta-impy-4b10d505ff65d150c3bd185e0ede8b5b89471be2.tar.bz2
meta-impy-4b10d505ff65d150c3bd185e0ede8b5b89471be2.tar.xz
Changed the show/hide shortcuts to be linux friendly
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml18
2 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 62e25f0..fff992d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
12009-02-17 McCabe Maxsted <hakushakukun@gmail.com> 12009-02-17 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
4 Changed the show/hide shortcuts to be linux friendly.
5
6
72009-02-17 McCabe Maxsted <hakushakukun@gmail.com>
8
3 * linden/indra/llmessage/llpumpio.cpp: 9 * linden/indra/llmessage/llpumpio.cpp:
4 Fixed crash in Top Scripts. 10 Fixed crash in Top Scripts.
5 11
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 2d5402b..4758116 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1064,42 +1064,42 @@
1064 <menu name="Features" drop_shadow="true" 1064 <menu name="Features" drop_shadow="true"
1065 opaque="true" tear_off="true"> 1065 opaque="true" tear_off="true">
1066 <menu_item_check name="UI" label="UI" 1066 <menu_item_check name="UI" label="UI"
1067 shortcut="control|alt|F1"> 1067 shortcut="alt|shift|F1">
1068 <on_click function="Advanced.ToggleFeature" 1068 <on_click function="Advanced.ToggleFeature"
1069 userdata="ui" /> 1069 userdata="ui" />
1070 <on_check function="Advanced.CheckFeature" 1070 <on_check function="Advanced.CheckFeature"
1071 userdata="ui" /> 1071 userdata="ui" />
1072 </menu_item_check> 1072 </menu_item_check>
1073 <menu_item_check name="Selected" label="Selected" 1073 <menu_item_check name="Selected" label="Selected"
1074 shortcut="control|alt|F2"> 1074 shortcut="alt|shift|F2">
1075 <on_click function="Advanced.ToggleFeature" 1075 <on_click function="Advanced.ToggleFeature"
1076 userdata="selected" /> 1076 userdata="selected" />
1077 <on_check function="Advanced.CheckFeature" 1077 <on_check function="Advanced.CheckFeature"
1078 userdata="selected" /> 1078 userdata="selected" />
1079 </menu_item_check> 1079 </menu_item_check>
1080 <menu_item_check name="Highlighted" label="Highlighted" 1080 <menu_item_check name="Highlighted" label="Highlighted"
1081 shortcut="control|alt|F3"> 1081 shortcut="alt|shift|F3">
1082 <on_click function="Advanced.ToggleFeature" 1082 <on_click function="Advanced.ToggleFeature"
1083 userdata="highlighted" /> 1083 userdata="highlighted" />
1084 <on_check function="Advanced.CheckFeature" 1084 <on_check function="Advanced.CheckFeature"
1085 userdata="highlighted" /> 1085 userdata="highlighted" />
1086 </menu_item_check> 1086 </menu_item_check>
1087 <menu_item_check name="Dynamic Textures" label="Dynamic Textures" 1087 <menu_item_check name="Dynamic Textures" label="Dynamic Textures"
1088 shortcut="control|alt|F4"> 1088 shortcut="alt|shift|F4">
1089 <on_click function="Advanced.ToggleFeature" 1089 <on_click function="Advanced.ToggleFeature"
1090 userdata="dynamic textures" /> 1090 userdata="dynamic textures" />
1091 <on_check function="Advanced.CheckFeature" 1091 <on_check function="Advanced.CheckFeature"
1092 userdata="dynamic textures" /> 1092 userdata="dynamic textures" />
1093 </menu_item_check> 1093 </menu_item_check>
1094 <menu_item_check name="Foot Shadows" label="Foot Shadows" 1094 <menu_item_check name="Foot Shadows" label="Foot Shadows"
1095 shortcut="control|alt|F5"> 1095 shortcut="alt|shift|F5">
1096 <on_click function="Advanced.ToggleFeature" 1096 <on_click function="Advanced.ToggleFeature"
1097 userdata="foot shadows" /> 1097 userdata="foot shadows" />
1098 <on_check function="Advanced.CheckFeature" 1098 <on_check function="Advanced.CheckFeature"
1099 userdata="foot shadows" /> 1099 userdata="foot shadows" />
1100 </menu_item_check> 1100 </menu_item_check>
1101 <menu_item_check name="Fog" label="Fog" 1101 <menu_item_check name="Fog" label="Fog"
1102 shortcut="control|alt|F6"> 1102 shortcut="alt|shift|F6">
1103 <on_click function="Advanced.ToggleFeature" 1103 <on_click function="Advanced.ToggleFeature"
1104 userdata="fog" /> 1104 userdata="fog" />
1105 <on_check function="Advanced.CheckFeature" 1105 <on_check function="Advanced.CheckFeature"
@@ -1107,14 +1107,14 @@
1107 </menu_item_check> 1107 </menu_item_check>
1108 <menu_item_check name="Palletized Textures" 1108 <menu_item_check name="Palletized Textures"
1109 label="Palletized Textures" 1109 label="Palletized Textures"
1110 shortcut="control|alt|F7"> 1110 shortcut="alt|shift|F7">
1111 <on_click function="Advanced.ToggleFeature" 1111 <on_click function="Advanced.ToggleFeature"
1112 userdata="palette" /> 1112 userdata="palette" />
1113 <on_check function="Advanced.CheckFeature" 1113 <on_check function="Advanced.CheckFeature"
1114 userdata="palette" /> 1114 userdata="palette" />
1115 </menu_item_check> 1115 </menu_item_check>
1116 <menu_item_check name="Test FRInfo" label="Test FRInfo" 1116 <menu_item_check name="Test FRInfo" label="Test FRInfo"
1117 shortcut="control|alt|F8"> 1117 shortcut="alt|shift|F8">
1118 <on_click function="Advanced.ToggleFeature" 1118 <on_click function="Advanced.ToggleFeature"
1119 userdata="fr info" /> 1119 userdata="fr info" />
1120 <on_check function="Advanced.CheckFeature" 1120 <on_check function="Advanced.CheckFeature"
@@ -1122,7 +1122,7 @@
1122 </menu_item_check> 1122 </menu_item_check>
1123 <menu_item_check name="Flexible Objects" 1123 <menu_item_check name="Flexible Objects"
1124 label="Flexible Objects" 1124 label="Flexible Objects"
1125 shortcut="control|alt|F9"> 1125 shortcut="alt|shift|F9">
1126 <on_click function="Advanced.ToggleFeature" 1126 <on_click function="Advanced.ToggleFeature"
1127 userdata="flexible" /> 1127 userdata="flexible" />
1128 <on_check function="Advanced.CheckFeature" 1128 <on_check function="Advanced.CheckFeature"