diff options
| author | skolb <none@none> | 2009-12-11 12:36:46 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-11 12:36:46 -0800 |
| commit | f51bf5d618614d5d6589ccc0fc27dc71cc33c259 (patch) | |
| tree | 70a3c809772c81388cc568f866f52e6a2eb7d47e /indra/newview/skins/default/xui | |
| parent | 6245ae0baca27e269982fc38309eb122678bd788 (diff) | |
| parent | b303dbb086462271e8e4b16eabb699921c647647 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui')
3 files changed, 9 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index a36bfb8ec1..660e3858ac 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -451,6 +451,14 @@ <menu_item_separator layout="topleft" /> <menu_item_call + label="Remove Link" + layout="topleft" + name="Remove Link"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="delete" /> + </menu_item_call> + <menu_item_call label="Delete" layout="topleft" name="Delete"> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index db8a844eb0..d006fd0700 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -489,15 +489,6 @@ bottom="5" width="313"> <button - follows="bottom|left" - height="25" - label="Edit" - layout="topleft" - left="0" - name="edit_btn" - top="0" - width="50" /> - <button follows="bottom|right" height="25" label="Cancel" diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 348f0dfc09..eff2ca1fcd 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -482,16 +482,7 @@ left="5" bottom="5" width="313"> - <button - follows="bottom|left" - height="25" - label="Edit" - layout="topleft" - left="0" - name="edit_btn" - top="0" - width="50" /> - <button + <button follows="bottom|left" height="25" label="Open" |