diff options
| author | Jacek Antonelli | 2008-09-21 17:13:40 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-21 17:13:40 -0500 |
| commit | fdb0e4c6f6a182ebba7b00d2748e4df613b3c893 (patch) | |
| tree | 2333f8d4d5747e4f856b08746d5d6759f2d0991c /linden/indra/newview/skins/default | |
| parent | Merge branch 'VWR-2896' into menu_viewer (diff) | |
| parent | VWR-1363: Add "Return Object" to the Tools menu. (diff) | |
| download | meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.zip meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.gz meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.bz2 meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.xz | |
Merge branch 'VWR-1363' into menu_viewer
Conflicts:
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
Diffstat (limited to 'linden/indra/newview/skins/default')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index e5a32ec..737fb56 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | |||
| @@ -590,6 +590,10 @@ | |||
| 590 | <on_click function="Tools.TakeCopy" userdata="" /> | 590 | <on_click function="Tools.TakeCopy" userdata="" /> |
| 591 | <on_enable function="Tools.EnableTakeCopy" /> | 591 | <on_enable function="Tools.EnableTakeCopy" /> |
| 592 | </menu_item_call> | 592 | </menu_item_call> |
| 593 | <menu_item_call name="Return..." enabled="false" label="Return Object"> | ||
| 594 | <on_click function="Object.Return" /> | ||
| 595 | <on_enable function="Object.EnableReturn" /> | ||
| 596 | </menu_item_call> | ||
| 593 | <menu_item_call name="Save Object Back to My Inventory" enabled="false" | 597 | <menu_item_call name="Save Object Back to My Inventory" enabled="false" |
| 594 | label="Save Object Back to My Inventory"> | 598 | label="Save Object Back to My Inventory"> |
| 595 | <on_click function="Tools.SaveToInventory" userdata="" /> | 599 | <on_click function="Tools.SaveToInventory" userdata="" /> |