diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-12-15 18:28:43 +0800 |
| commit | 91b49c8bfa061f3d3b8601d5398b1889a9e31850 (patch) | |
| tree | 98adc151491a2bee51a70cf7dd37de21d4f32bb3 /indra/newview/skins/default/xui/en | |
| parent | 0cce0b8149e049161ab17f1c608ded2d6cc12b0e (diff) | |
| parent | a80e3fe4191aee87c566937953d52fa6498b7f32 (diff) | |
Merge tag '7.1.1-release'
source for viewer 7.1.1.7039128750
Diffstat (limited to 'indra/newview/skins/default/xui/en')
4 files changed, 23 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 3a8f360e2d..0295ef8ccd 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -565,6 +565,14 @@ layout="topleft" name="Gesture Separator" /> <menu_item_call + label="Play" + layout="topleft" + name="PlayGesture"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="play" /> + </menu_item_call> + <menu_item_call label="Activate" layout="topleft" name="Activate"> diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index f7a9c552cc..4aadc0591c 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -47,7 +47,8 @@ top_pad="10" left="2" right="-4" - orientation="horizontal"> + orientation="horizontal" + name="top_stack"> <layout_panel border="false" bevel_style="in" @@ -101,7 +102,8 @@ user_resize="false" height="25" width="381" - visible="true"> + visible="true" + name="filter_layout_panel"> <combo_box height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index edf1e1efd4..0b3639f779 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -259,7 +259,7 @@ follows="left|top" layout="topleft" height="24" - width="52" + width="53" left_delta="2" top_pad="1" halign="right" @@ -271,7 +271,7 @@ follows="left|top" enabled="false" top_delta="3" - left_pad="21" + left_pad="20" height="20" layout="topleft" name="edt_invname_alt1" @@ -305,7 +305,7 @@ follows="left|top" layout="topleft" height="24" - width="52" + width="53" left_delta="2" top_pad="1" halign="right" @@ -317,7 +317,7 @@ follows="left|top" enabled="false" top_delta="3" - left_pad="21" + left_pad="20" height="20" layout="topleft" name="edt_invname_alt2" @@ -351,7 +351,7 @@ follows="left|top" layout="topleft" height="25" - width="52" + width="53" left_delta="2" top_pad="1" halign="right" @@ -363,7 +363,7 @@ follows="left|top" enabled="false" top_delta="3" - left_pad="21" + left_pad="20" height="20" layout="topleft" name="edt_invname_alt3" @@ -460,7 +460,7 @@ follows="left|top" layout="topleft" height="12" - width="52" + width="53" left_delta="2" top_pad="2" halign="right" @@ -477,7 +477,7 @@ mouse_opaque="false" visible="true" top_delta="-3" - left_pad="2"/> + left_pad="1"/> <line_editor follows="left|top" enabled="false" @@ -516,7 +516,7 @@ follows="left|top" layout="topleft" height="12" - width="52" + width="53" left_delta="2" top_pad="2" halign="right" @@ -533,7 +533,7 @@ mouse_opaque="false" visible="true" top_delta="-3" - left_pad="2"/> + left_pad="1"/> <line_editor follows="left|top" enabled="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b4bf0f59ba..b546c65ad5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2864,7 +2864,7 @@ If you continue to receive this message, please contact Second Life support for <string name="GroupMoneyBalance">Balance</string> <string name="GroupMoneyCredits">Credits</string> <string name="GroupMoneyDebits">Debits</string> - <string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string> + <string name="GroupMoneyStartDate">Transactions since [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string> <!-- Viewer menu --> <string name="AcquiredItems">Acquired Items</string> |