diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-05 15:47:45 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-05 15:47:45 -0800 |
| commit | bf46ac548bb3db0c4412ac982fb41cbbd295bda7 (patch) | |
| tree | 6541b1e84287d2d362f5696074b74a9942bb0cce /indra/newview/skins/default/xui/en/panel_preferences_general.xml | |
| parent | f8a3eb551f1f546dfb1b887c98a8eab80d322003 (diff) | |
WENG-1470 (Partial) Secondlife Login Screen Redesign - more steady progress
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_general.xml')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 63 |
1 files changed, 23 insertions, 40 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index ea0f7d8593..9da044ab64 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -179,46 +179,29 @@ left_pad="2" name="rating_icon_adult" width="18"/> - <text - type="string" - length="1" - follows="left|top" - height="15" - layout="topleft" - left="30" - name="start_location_textbox" - top_pad="8" - width="394"> - Start location: - </text> - <combo_box - control_name="LoginLocation" - follows="left|top" - height="23" - layout="topleft" - name="start_location_combo" - left="50" - width="200"> - <combo_box.item - label="My Last Location" - name="MyLastLocation" - value="last" /> - <combo_box.item - label="My Home" - name="MyHome" - value="home" /> - </combo_box> - <check_box - control_name="ShowStartLocation" - height="16" - initial_value="true" - label="Show on login" - layout="topleft" - left_pad="5" - name="show_location_checkbox" - top_delta="5" - width="256" /> - <text + <check_box + control_name="ShowFavoritesOnLogin" + enabled="false" + height="16" + layout="topleft" + label="Show favorite locations on login screen" + left="30" + name="favorites_on_login_check" + top_pad="10" + width="350" /> + <text + type="string" + length="1" + follows="left|top" + height="15" + layout="topleft" + left="52" + name="favorites_check_extra_text" + top_pad="0" + width="400"> + (Others using this computer will also see them) + </text> + <text type="string" length="1" follows="left|top" |