diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-11 17:42:37 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-11 17:42:37 -0800 |
| commit | e15b543dd655e2b93d9cab1326b389b6b04a7522 (patch) | |
| tree | 3a4ddcb1d4f0b84e76f8f1b9e21e4bccce98770f | |
| parent | 58d8b666c207be3eafa08a4650b8351ecc6a040e (diff) | |
| parent | 979cd0300fc42292ccd39f19c0f2a9e0ae347ac9 (diff) | |
STORM-975 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 516760aa5a..e1fb234f05 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -394,10 +394,7 @@ Jonathan Yap STORM-869 VWR-17801 VWR-24347 - STORM-844 - STORM-643 - STORM-960 - STORM-953 + STORM-975 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 08ae0c233e..606ff69599 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2747,18 +2747,6 @@ function="Floater.Toggle" parameter="region_debug_console" /> </menu_item_check> - <menu_item_check - label="Region Debug Console" - name="Region Debug Console" - shortcut="control|shift|`" - use_mac_ctrl="true"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="region_debug_console" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="region_debug_console" /> - </menu_item_check> <menu_item_separator /> |