diff options
author | Jacek Antonelli | 2009-05-25 22:06:04 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-05-25 22:06:04 -0500 |
commit | ef271368696c038755a20f3f75b6d91ef076dc25 (patch) | |
tree | 8299a7f79dfc8418f12023e14ad787fbff974c16 /linden/indra/newview | |
parent | Restore to Last Position has a confirmation dialog now. (diff) | |
download | meta-impy-ef271368696c038755a20f3f75b6d91ef076dc25.zip meta-impy-ef271368696c038755a20f3f75b6d91ef076dc25.tar.gz meta-impy-ef271368696c038755a20f3f75b6d91ef076dc25.tar.bz2 meta-impy-ef271368696c038755a20f3f75b6d91ef076dc25.tar.xz |
Added a separator between Wear and Restore to Last Position.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 1 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 9675165..7af8c89 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
@@ -3439,6 +3439,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) | |||
3439 | items.push_back(std::string("Object Wear")); | 3439 | items.push_back(std::string("Object Wear")); |
3440 | items.push_back(std::string("Attach To")); | 3440 | items.push_back(std::string("Attach To")); |
3441 | items.push_back(std::string("Attach To HUD")); | 3441 | items.push_back(std::string("Attach To HUD")); |
3442 | items.push_back(std::string("RestoreToWorld Separator")); | ||
3442 | items.push_back(std::string("Restore to Last Position")); | 3443 | items.push_back(std::string("Restore to Last Position")); |
3443 | 3444 | ||
3444 | LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE); | 3445 | LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE); |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml index aa61e77..ff3b8ce 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | |||
@@ -218,15 +218,17 @@ | |||
218 | name="Deactivate" width="128"> | 218 | name="Deactivate" width="128"> |
219 | <on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" /> | 219 | <on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" /> |
220 | </menu_item_call> | 220 | </menu_item_call> |
221 | <menu_item_separator name="RestoreToWorld Separator" /> | ||
222 | <menu_item_call name="Restore to Last Position" | ||
223 | label="Restore to Last Position"> | ||
224 | <on_click filter="" function="Inventory.DoToSelected" | ||
225 | userdata="restoreToWorld" /> | ||
226 | </menu_item_call> | ||
221 | <menu_item_separator name="Attach Separator" /> | 227 | <menu_item_separator name="Attach Separator" /> |
222 | <menu_item_call bottom_delta="-18" height="18" label="Detach From Yourself" left="0" | 228 | <menu_item_call bottom_delta="-18" height="18" label="Detach From Yourself" left="0" |
223 | mouse_opaque="true" name="Detach From Yourself" width="128"> | 229 | mouse_opaque="true" name="Detach From Yourself" width="128"> |
224 | <on_click filter="" function="Inventory.DoToSelected" userdata="detach" /> | 230 | <on_click filter="" function="Inventory.DoToSelected" userdata="detach" /> |
225 | </menu_item_call> | 231 | </menu_item_call> |
226 | <menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true" | ||
227 | name="Restore to Last Position" width="128"> | ||
228 | <on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" /> | ||
229 | </menu_item_call> | ||
230 | <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true" | 232 | <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true" |
231 | name="Object Wear" width="128"> | 233 | name="Object Wear" width="128"> |
232 | <on_click filter="" function="Inventory.DoToSelected" userdata="attach" /> | 234 | <on_click filter="" function="Inventory.DoToSelected" userdata="attach" /> |