diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 10:56:48 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 10:56:48 +0100 |
| commit | 61403b1ecc748d03ec1f94eb56a6d1a701f6dcc5 (patch) | |
| tree | 66e1d54aa97fcc5c9f8d64e9e5355fe7b699a90e /indra | |
| parent | fd0b287be34f0d90b02c332494c96769c6ebb912 (diff) | |
| parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 9 |
3 files changed, 3 insertions, 16 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 529a368dc3..67aea5544d 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -455,12 +455,6 @@ void LLPanelLogin::draw() // virtual BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask) { - if (( KEY_RETURN == key ) && (MASK_ALT == mask)) - { - gViewerWindow->toggleFullscreen(FALSE); - return TRUE; - } - if ( KEY_F1 == key ) { LLViewerHelp* vhelp = LLViewerHelp::getInstance(); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8347927db2..b63ef921ac 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3785,7 +3785,9 @@ class LLViewFullscreen : public view_listener_t { bool handleEvent(const LLSD& userdata) { - gViewerWindow->toggleFullscreen(TRUE); + // we no longer permit full screen mode EXT-6775 + // gViewerWindow->toggleFullscreen(TRUE); + llwarns << "full screen mode no longer supported" << llendl; return true; } }; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 19b6b1b22e..bdc171ea52 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1565,15 +1565,6 @@ <menu_item_call.on_click function="View.ZoomOut" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call - label="Toggle Fullscreen" - name="Toggle Fullscreen" - > - <!-- Note: shortcut="alt|Enter" was deleted from the preceding node--> - <menu_item_call.on_click - function="View.Fullscreen" /> - </menu_item_call> </menu> <menu_item_separator/> <menu_item_call |