diff options
Diffstat (limited to '')
-rw-r--r-- | linden/doc/contributions.txt | 1 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 41f896f..6646a40 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
@@ -91,6 +91,7 @@ Aleric Inglewood | |||
91 | IMP-670 | 91 | IMP-670 |
92 | IMP-688 | 92 | IMP-688 |
93 | IMP-692 | 93 | IMP-692 |
94 | IMP-712 | ||
94 | Alissa Sabre | 95 | Alissa Sabre |
95 | VWR-81 | 96 | VWR-81 |
96 | VWR-83 | 97 | VWR-83 |
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 31e730a..01a5b6e 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 | |||
@@ -267,7 +267,8 @@ | |||
267 | <on_check function="FloaterVisible" | 267 | <on_check function="FloaterVisible" |
268 | userdata="friends" /> | 268 | userdata="friends" /> |
269 | </menu_item_check> | 269 | </menu_item_check> |
270 | <menu_item_call name="Groups" label="Groups"> | 270 | <menu_item_call name="Groups" label="Groups" |
271 | shortcut="control|shift|G"> | ||
271 | <on_click function="ShowAgentGroups" | 272 | <on_click function="ShowAgentGroups" |
272 | userdata="agent" /> | 273 | userdata="agent" /> |
273 | </menu_item_call> | 274 | </menu_item_call> |