diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:58:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:58:23 +0000 |
| commit | 6f41747bc4d8afcb2b19ac02295575031bcf9021 (patch) | |
| tree | 1e83d8fcf7af6b9416b49bb46cb9e7cf15abffbc /indra/newview/skins/default/xui/en | |
| parent | 57fca109cae3105b6bc1319e9886c16631bc7374 (diff) | |
Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_teleport_history_item.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_people.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml index 515278c23d..0160d52b17 100644 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml @@ -17,10 +17,10 @@ function="TeleportHistory.MoreInformation" /> </menu_item_call> <menu_item_call - label="Copy" + label="Copy to Clipboard" layout="topleft" - name="Copy"> + name="CopyToClipboard"> <menu_item_call.on_click - function="TeleportHistory.Copy" /> + function="TeleportHistory.CopyToClipboard" /> </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 8076b88a65..085b732473 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -68,6 +68,7 @@ background_visible="true" <avatar_list follows="all" height="470" + ignore_online_status="true" layout="topleft" left="0" name="avatar_list" |