Removed control_name from old combo boxes to avoid conflicts.

author: Jacek Antonelli 2010-08-01 03:42:23 -0500
committer: Jacek Antonelli 2010-08-01 03:42:41 -0500
commit: 7e7f17b56f6c8231660c15d9669098a916381e65 (patch)
tree: 7e1c065a88034d62a8014bc8e96292f449fc0ca2
parent: LLComboBox now properly respects control_name. (diff)
download: meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.zip
meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.tar.gz
meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.tar.bz2
meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.tar.xz
3 files changed, 19 insertions, 19 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
index 134bd13..17c205f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
@@ -135,7 +135,7 @@
                 mouse_opaque="true" name="textdefaultwalk" v_pad="0" width="180">
        Default Walk:
      </text>
-      <combo_box name="walks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultWalk" />
+      <combo_box name="walks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
@@ -143,105 +143,105 @@
                 mouse_opaque="true" name="textdefaultrun" v_pad="0" width="180">
        Default Run:
      </text>
-      <combo_box name="runs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultRun" />
+      <combo_box name="runs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                 mouse_opaque="true" name="textdefaultjump" v_pad="0" width="180">
        Default Jump:
      </text>
-      <combo_box name="jumps" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultJump" />
+      <combo_box name="jumps" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
         mouse_opaque="true" name="textdefaultsit" v_pad="0" width="180">
        Default Sit:
      </text>
-      <combo_box name="sits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultSit" />
+      <combo_box name="sits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                 mouse_opaque="true" name="textdefaultgsit" v_pad="0" width="180">
        Default Groundsit:
      </text>
-      <combo_box name="gsits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultGroundSit" />
+      <combo_box name="gsits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                 mouse_opaque="true" name="textdefaultcrouch" v_pad="0" width="180">
        Default Crouch:
      </text>
-      <combo_box name="crouchs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultCrouch" />
+      <combo_box name="crouchs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                 mouse_opaque="true" name="textdefaultcrouchwalk" v_pad="0" width="180">
        Default Crouchwalk:
      </text>
-      <combo_box name="cwalks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultCrouchWalk" />
+      <combo_box name="cwalks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                 mouse_opaque="true" name="textdefaultfall" v_pad="0" width="180">
        Default Fall:
      </text>
-      <combo_box name="falls" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultFall" />
+      <combo_box name="falls" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="280" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
                 mouse_opaque="true" name="textdefaulthover" v_pad="0" width="180">
        Default Hover:
      </text>
-      <combo_box name="hovers" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultHover" />
+      <combo_box name="hovers" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultfly" v_pad="0" width="180">
        Default Fly:
      </text>
-      <combo_box name="flys" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFly" />
+      <combo_box name="flys" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultflyslow" v_pad="0" width="180">
        Default Slow Fly:
      </text>
-      <combo_box name="flyslows" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlySlow" />
+      <combo_box name="flyslows" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultflyup" v_pad="0" width="180">
        Default Upward Fly:
      </text>
-      <combo_box name="flyups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlyUp" />
+      <combo_box name="flyups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultflydown" v_pad="0" width="180">
        Default Downward Fly:
      </text>
-      <combo_box name="flydowns" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlyDown" />
+      <combo_box name="flydowns" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultland" v_pad="0" width="180">
        Default Land:
      </text>
-      <combo_box name="lands" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultLand" />
+      <combo_box name="lands" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultstandup" v_pad="0" width="180">
        Default Standup:
      </text>
-      <combo_box name="standups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultStandUp" />
+      <combo_box name="standups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                 mouse_opaque="true" name="textdefaultprejump" v_pad="0" width="180">
        Default Pre-Jump:
      </text>
-      <combo_box name="prejumps" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultPreJump" />
+      <combo_box name="prejumps" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
  </panel>
 </tab_container>
-</floater>
-\ No newline at end of file
+</floater>
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 8d5d6b4..24a895b 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
@@ -19,7 +19,7 @@
                left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
    Antialiasing:
  </text>
-  <combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left|top"
+  <combo_box bottom="-65" enabled="true" follows="left|top"
                font="SansSerifSmall" height="16" initial_value="false"
                label="Antialiasing" left="148"
                mouse_opaque="true" name="fsaa" width="64">
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 49ab842..199f2a8 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
@@ -117,7 +117,7 @@
                 I want to access content rated:
        </text>
        <combo_box bottom="-318" follows="left|top" height="18" left="315"
-             mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">
+             mouse_opaque="true" name="maturity_desired_combobox" width="150">
                <combo_item name="Desired_Adult" value="42">
                        PG, Mature and Adult
                </combo_item>
author	Jacek Antonelli	2010-08-01 03:42:23 -0500
committer	Jacek Antonelli	2010-08-01 03:42:41 -0500
commit	7e7f17b56f6c8231660c15d9669098a916381e65 (patch)
tree	7e1c065a88034d62a8014bc8e96292f449fc0ca2
parent	LLComboBox now properly respects control_name. (diff)
download	meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.zip meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.tar.gz meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.tar.bz2 meta-impy-7e7f17b56f6c8231660c15d9669098a916381e65.tar.xz

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml index 134bd13..17c205f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
@@ -135,7 +135,7 @@
135	mouse_opaque="true" name="textdefaultwalk" v_pad="0" width="180">	135	mouse_opaque="true" name="textdefaultwalk" v_pad="0" width="180">
136	Default Walk:	136	Default Walk:
137	</text>	137	</text>
138	<combo_box name="walks" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultWalk" />	138	<combo_box name="walks" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
139		139
140	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	140	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
141	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	141	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
@@ -143,105 +143,105 @@
143	mouse_opaque="true" name="textdefaultrun" v_pad="0" width="180">	143	mouse_opaque="true" name="textdefaultrun" v_pad="0" width="180">
144	Default Run:	144	Default Run:
145	</text>	145	</text>
146	<combo_box name="runs" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultRun" />	146	<combo_box name="runs" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
147	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	147	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
148	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	148	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
149	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	149	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
150	mouse_opaque="true" name="textdefaultjump" v_pad="0" width="180">	150	mouse_opaque="true" name="textdefaultjump" v_pad="0" width="180">
151	Default Jump:	151	Default Jump:
152	</text>	152	</text>
153	<combo_box name="jumps" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultJump" />	153	<combo_box name="jumps" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
154	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	154	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
155	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	155	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
156	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	156	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
157	mouse_opaque="true" name="textdefaultsit" v_pad="0" width="180">	157	mouse_opaque="true" name="textdefaultsit" v_pad="0" width="180">
158	Default Sit:	158	Default Sit:
159	</text>	159	</text>
160	<combo_box name="sits" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultSit" />	160	<combo_box name="sits" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
161	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	161	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
162	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	162	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
163	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	163	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
164	mouse_opaque="true" name="textdefaultgsit" v_pad="0" width="180">	164	mouse_opaque="true" name="textdefaultgsit" v_pad="0" width="180">
165	Default Groundsit:	165	Default Groundsit:
166	</text>	166	</text>
167	<combo_box name="gsits" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultGroundSit" />	167	<combo_box name="gsits" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
168	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	168	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
169	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	169	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
170	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	170	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
171	mouse_opaque="true" name="textdefaultcrouch" v_pad="0" width="180">	171	mouse_opaque="true" name="textdefaultcrouch" v_pad="0" width="180">
172	Default Crouch:	172	Default Crouch:
173	</text>	173	</text>
174	<combo_box name="crouchs" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultCrouch" />	174	<combo_box name="crouchs" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
175	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	175	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
176	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	176	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
177	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	177	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
178	mouse_opaque="true" name="textdefaultcrouchwalk" v_pad="0" width="180">	178	mouse_opaque="true" name="textdefaultcrouchwalk" v_pad="0" width="180">
179	Default Crouchwalk:	179	Default Crouchwalk:
180	</text>	180	</text>
181	<combo_box name="cwalks" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultCrouchWalk" />	181	<combo_box name="cwalks" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
182	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	182	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
183	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	183	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
184	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	184	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
185	mouse_opaque="true" name="textdefaultfall" v_pad="0" width="180">	185	mouse_opaque="true" name="textdefaultfall" v_pad="0" width="180">
186	Default Fall:	186	Default Fall:
187	</text>	187	</text>
188	<combo_box name="falls" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultFall" />	188	<combo_box name="falls" label="" follows="left\|top" height="20" left="10" width="180" bottom_delta="0" />
189	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	189	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
190	bottom_delta="280" drop_shadow_visible="true" follows="left\|bottom"	190	bottom_delta="280" drop_shadow_visible="true" follows="left\|bottom"
191	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"	191	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
192	mouse_opaque="true" name="textdefaulthover" v_pad="0" width="180">	192	mouse_opaque="true" name="textdefaulthover" v_pad="0" width="180">
193	Default Hover:	193	Default Hover:
194	</text>	194	</text>
195	<combo_box name="hovers" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultHover" />	195	<combo_box name="hovers" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
196	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	196	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
197	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	197	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
198	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	198	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
199	mouse_opaque="true" name="textdefaultfly" v_pad="0" width="180">	199	mouse_opaque="true" name="textdefaultfly" v_pad="0" width="180">
200	Default Fly:	200	Default Fly:
201	</text>	201	</text>
202	<combo_box name="flys" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFly" />	202	<combo_box name="flys" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
203	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	203	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
204	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	204	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
205	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	205	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
206	mouse_opaque="true" name="textdefaultflyslow" v_pad="0" width="180">	206	mouse_opaque="true" name="textdefaultflyslow" v_pad="0" width="180">
207	Default Slow Fly:	207	Default Slow Fly:
208	</text>	208	</text>
209	<combo_box name="flyslows" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlySlow" />	209	<combo_box name="flyslows" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
210	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	210	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
211	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	211	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
212	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	212	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
213	mouse_opaque="true" name="textdefaultflyup" v_pad="0" width="180">	213	mouse_opaque="true" name="textdefaultflyup" v_pad="0" width="180">
214	Default Upward Fly:	214	Default Upward Fly:
215	</text>	215	</text>
216	<combo_box name="flyups" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlyUp" />	216	<combo_box name="flyups" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
217	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	217	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
218	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	218	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
219	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	219	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
220	mouse_opaque="true" name="textdefaultflydown" v_pad="0" width="180">	220	mouse_opaque="true" name="textdefaultflydown" v_pad="0" width="180">
221	Default Downward Fly:	221	Default Downward Fly:
222	</text>	222	</text>
223	<combo_box name="flydowns" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlyDown" />	223	<combo_box name="flydowns" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
224	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	224	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
225	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	225	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
226	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	226	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
227	mouse_opaque="true" name="textdefaultland" v_pad="0" width="180">	227	mouse_opaque="true" name="textdefaultland" v_pad="0" width="180">
228	Default Land:	228	Default Land:
229	</text>	229	</text>
230	<combo_box name="lands" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultLand" />	230	<combo_box name="lands" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
231	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	231	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
232	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	232	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
233	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	233	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
234	mouse_opaque="true" name="textdefaultstandup" v_pad="0" width="180">	234	mouse_opaque="true" name="textdefaultstandup" v_pad="0" width="180">
235	Default Standup:	235	Default Standup:
236	</text>	236	</text>
237	<combo_box name="standups" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultStandUp" />	237	<combo_box name="standups" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
238	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	238	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
239	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"	239	bottom_delta="-40" drop_shadow_visible="true" follows="left\|bottom"
240	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"	240	font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
241	mouse_opaque="true" name="textdefaultprejump" v_pad="0" width="180">	241	mouse_opaque="true" name="textdefaultprejump" v_pad="0" width="180">
242	Default Pre-Jump:	242	Default Pre-Jump:
243	</text>	243	</text>
244	<combo_box name="prejumps" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultPreJump" />	244	<combo_box name="prejumps" label="" follows="left\|top" height="20" left_delta="0" width="180" bottom_delta="0" />
245	</panel>	245	</panel>
246	</tab_container>	246	</tab_container>
247	</floater> \ No newline at end of file	247	</floater>


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 8d5d6b4..24a895b 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
@@ -19,7 +19,7 @@
19	left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">	19	left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
20	Antialiasing:	20	Antialiasing:
21	</text>	21	</text>
22	<combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left\|top"	22	<combo_box bottom="-65" enabled="true" follows="left\|top"
23	font="SansSerifSmall" height="16" initial_value="false"	23	font="SansSerifSmall" height="16" initial_value="false"
24	label="Antialiasing" left="148"	24	label="Antialiasing" left="148"
25	mouse_opaque="true" name="fsaa" width="64">	25	mouse_opaque="true" name="fsaa" width="64">


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 49ab842..199f2a8 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
@@ -117,7 +117,7 @@
117	I want to access content rated:	117	I want to access content rated:
118	</text>	118	</text>
119	<combo_box bottom="-318" follows="left\|top" height="18" left="315"	119	<combo_box bottom="-318" follows="left\|top" height="18" left="315"
120	mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">	120	mouse_opaque="true" name="maturity_desired_combobox" width="150">
121	<combo_item name="Desired_Adult" value="42">	121	<combo_item name="Desired_Adult" value="42">
122	PG, Mature and Adult	122	PG, Mature and Adult
123	</combo_item>	123	</combo_item>