diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
5 files changed, 10 insertions, 24 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index 17bc818cc1..519d3e043c 100755 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -301,6 +301,7 @@ top_pad="4" width="64" /> <text + name="label_hours" type="string" length="1" follows="left|top" @@ -323,6 +324,7 @@ left="8" width="64" /> <text + name="label_days" type="string" length="1" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a1449..05bda0259d 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3793,29 +3793,7 @@ Leave Group? </notification> <notification - icon="aler.tga" - name="GroupDepartError" - type="alert"> -Unable to leave group: [reason]. - <tag>reason</tag> - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification icon="alert.tga" - name="GroupDepart" - type="alert"> -You have left the group [group_name]. - <tag>group_name</tag> - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - icon="aler.tga" name="GroupDepartError" type="alert"> Unable to leave group: [reason]. diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 8e867259c5..8d55e311f6 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -453,6 +453,7 @@ width="505"> <text + name="logging_label" layout="topleft" left="0" text_color="White" @@ -468,16 +469,19 @@ height="23" layout="topleft" left_pad="5" - name="chat_font_size" + name="conversation_log_combo" top="0" width="165"> <item + name="log_and_transcripts" label="Log and transcripts" value="2"/> <item + name="log_only" label="Log only" value="1"/> <item + name="no_log_or_transcript" label="No log or transcripts" value="0"/> </combo_box> @@ -509,6 +513,7 @@ </button> <text + name="log_location_label" layout="topleft" left="0" text_color="White" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 1e9a1aa27c..10f2a3a8b9 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -173,7 +173,7 @@ label="Use built-in browser for all links" layout="topleft" left="0" - name="internal" + name="external_all" value="2" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." top_delta="20" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 8f90521bb2..eb67d07601 100755 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -338,6 +338,7 @@ mouse_opaque="false" orientation="horizontal"> <layout_panel + name="media_address_url_icons_wl" layout="topleft" width="16" mouse_opaque="false" |