aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-12-31 02:20:30 -0700
committerMcCabe Maxsted2009-12-31 02:20:30 -0700
commitc8390cbef5170142a81b91d503c6ce6688e5209c (patch)
treeb006f27076699ad2d7ae49f4316826dd4ec006eb /linden/indra/newview/skins
parentAdded preferences option to use legacy pie menu layout (diff)
downloadmeta-impy-c8390cbef5170142a81b91d503c6ce6688e5209c.zip
meta-impy-c8390cbef5170142a81b91d503c6ce6688e5209c.tar.gz
meta-impy-c8390cbef5170142a81b91d503c6ce6688e5209c.tar.bz2
meta-impy-c8390cbef5170142a81b91d503c6ce6688e5209c.tar.xz
Moved notify when L$ spent from Preferences > General to Preferences > Popups
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml19
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml5
2 files changed, 12 insertions, 12 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index dba8007..263a9e9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -88,7 +88,7 @@
88 label="Away Timeout:" label_width="141" left="10" max_val="600" 88 label="Away Timeout:" label_width="141" left="10" max_val="600"
89 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" /> 89 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
90 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 90 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
91 bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" 91 bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
92 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 92 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
93 mouse_opaque="true" name="UI Size:" v_pad="0" width="128"> 93 mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
94 Mini-map notify: 94 Mini-map notify:
@@ -103,24 +103,19 @@
103 label="Entering sim" left="330" 103 label="Entering sim" left="330"
104 mouse_opaque="true" name="mini_map_notify_sim" radio_style="false" 104 mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
105 width="256" /> 105 width="256" />
106 <check_box bottom="-304" enabled="true"
107 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
108 label="Notify when Linden dollars (L$) spent or received" left="151"
109 mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
110 width="256" />
111 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 106 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
112 bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top" 107 bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
113 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" 108 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
114 mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394"> 109 mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
115 Rating: 110 Rating:
116 </text> 111 </text>
117 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 112 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
118 bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top" 113 bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
119 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151" 114 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
120 mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394"> 115 mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
121 I want to access content rated: 116 I want to access content rated:
122 </text> 117 </text>
123 <combo_box bottom="-328" follows="left|top" height="18" left="315" 118 <combo_box bottom="-318" follows="left|top" height="18" left="315"
124 mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity"> 119 mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">
125 <combo_item name="Desired_Adult" value="42"> 120 <combo_item name="Desired_Adult" value="42">
126 PG, Mature and Adult 121 PG, Mature and Adult
@@ -133,7 +128,7 @@
133 </combo_item> 128 </combo_item>
134 </combo_box> 129 </combo_box>
135 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 130 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
136 bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top" 131 bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
137 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315" 132 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
138 mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150"> 133 mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
139 PG only 134 PG only
@@ -163,7 +158,7 @@
163 seconds 158 seconds
164 </text> 159 </text>
165 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 160 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
166 bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top" 161 bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
167 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" 162 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
168 mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394"> 163 mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
169 Crash reports: 164 Crash reports:
@@ -184,7 +179,7 @@
184 <string name="region_name_prompt"> 179 <string name="region_name_prompt">
185 &lt;Type region name&gt; 180 &lt;Type region name&gt;
186 </string> 181 </string>
187 <combo_box allow_text_entry="false" bottom="-362" enabled="true" follows="left|top" 182 <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
188 height="18" left="153" max_chars="20" mouse_opaque="true" 183 height="18" left="153" max_chars="20" mouse_opaque="true"
189 name="crash_behavior_combobox" width="146"> 184 name="crash_behavior_combobox" width="146">
190 <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending"> 185 <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index cd98623..d724256 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -39,4 +39,9 @@
39 follows="left|top" font="SansSerifSmall" height="16" initial_value="true" 39 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
40 label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true" 40 label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true"
41 name="show_in_inventory" radio_style="false" width="270" /> 41 name="show_in_inventory" radio_style="false" width="270" />
42 <check_box bottom_delta="-30" enabled="true"
43 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
44 label="Notify when Linden dollars (L$) spent or received" left="15"
45 mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
46 width="256" />
42</panel> 47</panel>