Change from Y to Shift-Z for "redo". Y was already assigned to Simplify. Whoops.

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index 86bdf363930e4907eb003c22250f8a33b15b43db..94e60aaa8313d720908941d753de77cec5be99f0 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -67,8 +67,8 @@ package net.systemeD.potlatch2.controller {
                                case 68:        controller.map.paint.alpha=1.3-controller.map.paint.alpha; return null; // D - dim
                                case 83:        SaveManager.saveChanges(); break;                                                                               // S - save
                                case 84:        controller.tagViewer.togglePanel(); return null;                                                // T - toggle tags panel
-                               case 90:        MainUndoStack.getGlobalStack().undo(); return null;                                             // Z - undo
-                case 89:    MainUndoStack.getGlobalStack().redo(); return null;                     // Y - redo
+                               case 90:        if (!event.shiftKey) { MainUndoStack.getGlobalStack().undo(); return null;}// Z - undo
+                                           else { MainUndoStack.getGlobalStack().redo(); return null;  }           // Shift-Z - redo                                           
                                case Keyboard.ESCAPE:   revertSelection(); break;                                                                       // ESC - revert to server version
                                case Keyboard.NUMPAD_ADD:                                                                                                                       // + - add tag
                                case 187:       controller.tagViewer.selectAdvancedPanel();                                                             //   |