diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-09-11 15:25:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-09-11 15:25:24 -0400 |
| commit | f70296ec68c9205bfa9ec295393584155b488e48 (patch) | |
| tree | 1207d1ec5520b277b6a5252b32a41425626e20ac | |
| parent | f6bcf6dd39b80befda027b3a5ee3bb4f66bb6221 (diff) | |
| parent | f4d2e21f4fdf6953cfa375bd716b1458e3de14e8 (diff) | |
merge changes for storm-1902
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index b0c47f9cd8..00202eec5e 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1366,6 +1366,7 @@ YongYong Francois Zak Westminster Zai Lynch VWR-19505 + STORM-1902 Zana Kohime Zaren Alexander Zarkonnen Decosta diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index dabfc4eebd..0e95a9d9a9 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -180,7 +180,7 @@ name="Preferences" shortcut="control|P"> <menu_item_call.on_click - function="Floater.Show" + function="Floater.Toggle" parameter="preferences" /> </menu_item_call> <menu_item_call |