Merge branch 'develop' into rlva/base

1 files changed, 13 insertions, 8 deletions

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 80001b14ee..e95ad4d970 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -221,14 +221,14 @@ bool callKeyDown(NSKeyEventRef event, unsigned short key, unsigned int mask, wch
 {
     //if (mask!=MASK_NONE)
     {
-        if((key == gKeyboard->inverseTranslateKey('Z')) && (character == 'y'))
-        {
-            key = gKeyboard->inverseTranslateKey('Y');
-        }
-        else if ((key == gKeyboard->inverseTranslateKey('Y')) && (character == 'z'))
-        {
-            key = gKeyboard->inverseTranslateKey('Z');
-        }
+    if((key == gKeyboard->inverseTranslateKey('Z')) && (character == 'y'))
+    {
+        key = gKeyboard->inverseTranslateKey('Y');
+    }
+    else if ((key == gKeyboard->inverseTranslateKey('Y')) && (character == 'z'))
+    {
+        key = gKeyboard->inverseTranslateKey('Z');
+    }
     }
 
     mRawKeyEvent = event;
@@ -2556,6 +2556,11 @@ F32 LLWindowMacOSX::getSystemUISize()
     return gHiDPISupport ? ::getDeviceUnitSize(mGLView) : LLWindow::getSystemUISize();
 }
 
+void LLWindowMacOSX::openFolder(const std::string &path)
+{
+    openFolderWithFinder(path.c_str());
+}
+
 #if LL_OS_DRAGDROP_ENABLED
 /*
 S16 LLWindowMacOSX::dragTrackingHandler(DragTrackingMessage message, WindowRef theWindow,