Merge branch 'main' into maint-b

22 files changed, 570 insertions, 156 deletions

diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index a748237c5b..59620b60b4 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -6,32 +6,64 @@ set(INSTALL OFF CACHE BOOL
     "Generate install target.")
 
 if (INSTALL)
-  set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH
-      "Top-level installation directory.")
-
-  if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
-    set(_LIB lib/${ARCH}-linux-gnu)
-  elseif (EXISTS /lib64)
-    set(_LIB lib64)
-  else ()
-    set(_LIB lib)
-  endif ()
-
-  set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH
-      "Installation directory for read-only shared files.")
-
-  set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
-      "Installation directory for read-only shared files.")
-
-  set(APP_BINARY_DIR ${INSTALL_PREFIX}/bin
-      CACHE PATH
-      "Installation directory for binaries.")
-
-  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/${VIEWER_BINARY_NAME}
-      CACHE PATH
-      "Installation directory for read-only data files.")
-
-  set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec/${VIEWER_BINARY_NAME}
-      CACHE PATH
-      "Installation directory for non-manual executables.")
+
+  if (DARWIN)
+
+    set(INSTALL_PREFIX
+        ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents
+        CACHE PATH
+        "Top-level installation directory.")
+
+    set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/Resources
+        CACHE PATH
+        "Installation directory for read-only shared files.")
+
+    set(INSTALL_SHARE_DIR ${INSTALL_LIBRARY_DIR} CACHE PATH
+        "Installation directory for read-only shared files.")
+
+    set(APP_BINARY_DIR ${INSTALL_PREFIX}/MacOS
+        CACHE PATH
+        "Installation directory for binaries.")
+
+    set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}
+        CACHE PATH
+        "Installation directory for read-only data files.")
+
+    set(APP_LIBEXEC_DIR ${INSTALL_LIBRARY_DIR}
+        CACHE PATH
+        "Installation directory for non-manual executables.")
+
+  else (DARWIN)
+
+    set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH
+        "Top-level installation directory.")
+
+    if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+      set(_LIB lib/${ARCH}-linux-gnu)
+    elseif (EXISTS /lib64)
+      set(_LIB lib64)
+    else ()
+      set(_LIB lib)
+    endif ()
+
+    set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH
+        "Installation directory for read-only shared files.")
+
+    set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
+        "Installation directory for read-only shared files.")
+
+    set(APP_BINARY_DIR ${INSTALL_PREFIX}/bin
+        CACHE PATH
+        "Installation directory for binaries.")
+
+    set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/${VIEWER_BINARY_NAME}
+        CACHE PATH
+        "Installation directory for read-only data files.")
+
+    set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec/${VIEWER_BINARY_NAME}
+        CACHE PATH
+        "Installation directory for non-manual executables.")
+
+  endif (DARWIN)
+
 endif (INSTALL)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index e86ddd8a32..c3752a4705 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -66,8 +66,13 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 if (INSTALL)
-  install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME})
-endif ()
+  if (DARWIN)
+    install(TARGETS ${PROJECT_NAME}
+      DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources)
+  else (DARWIN)
+    install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME})
+  endif (DARWIN)
+endif (INSTALL)
 
 if (LL_TESTS)
   ll_deploy_sharedlibs_command(SLPlugin)
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 52fb58187a..30a7ed796a 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -37,6 +37,10 @@
 #include "llglslshader.h"
 #include "llmemory.h"
 
+#include "llcontrol.h"
+
+extern LLControlGroup gSavedSettings;
+
 //Next Highest Power Of Two
 //helper function, returns first number > v that is a power of 2, or v if v is already a power of 2
 U32 nhpo2(U32 v)
@@ -530,6 +534,7 @@ U32 LLVertexBuffer::sGLRenderIndices = 0;
 U32 LLVertexBuffer::sLastMask = 0;
 U32 LLVertexBuffer::sVertexCount = 0;
 
+U32 LLVertexBuffer::sMappingMode = gSavedSettings.getU32("MPVBufferOptiMode");
 
 //NOTE: each component must be AT LEAST 4 bytes in size to avoid a performance penalty on AMD hardware
 const U32 LLVertexBuffer::sTypeSize[LLVertexBuffer::TYPE_MAX] =
@@ -1144,93 +1149,58 @@ U8* LLVertexBuffer::mapIndexBuffer(U32 index, S32 count)
 //  start -- first byte to copy
 //  end -- last byte to copy (NOT last byte + 1)
 //  data -- mMappedData or mMappedIndexData
-static void flush_vbo(GLenum target, U32 start, U32 end, void* data)
+static void flush_vbo(GLenum target, U32 start, U32 end, void* data, S16 mode)
 {
-    if (end != 0)
+    if (end == 0) return;
+
+    if (mode == 0)
+    {
+        if(gGLManager.mIsApple) mode = 2;
+        else mode = 1;
+    }
+
+    if (mode == 1)
     {
-        //Note (observeur): I maintained the profile "glBufferSubData" names because i'm not sure if it would impact any statistics part somewhere in the code.
         LL_PROFILE_ZONE_NAMED_CATEGORY_VERTEX("glBufferSubData");
         LL_PROFILE_ZONE_NUM(start);
         LL_PROFILE_ZONE_NUM(end);
         LL_PROFILE_ZONE_NUM(end-start);
 
-        U32 size = end-start+1;
-        U32 block_size = 65536;
+        const U32 block_size = 65536;
 
-        //Note (observeur): The following code is executed on non Apple gpus. Using glMapBufferRange() didn't show obvious benefit on the other tested platforms (intel igpu, amd igpu and nVidia dgpus).
-        if(!gGLManager.mIsApple)
-        {
-            for (U32 i = start; i <= end; i += block_size)
-            {
-                LL_PROFILE_ZONE_NAMED_CATEGORY_VERTEX("glBufferSubData block");
-                LL_PROFILE_GPU_ZONE("glBufferSubData");
-                U32 tend = llmin(i + block_size, end);
-                U32 size = tend - i + 1;
-                glBufferSubData(target, i, size, (U8*) data + (i-start));
-            }
-
-            return;
-        }
-
-        //Note (observeur): glBufferSubData() was causing synchronization stalls on Apple GPUs resulting to heavy stutters and lower performance in the world and UI rendering. Using glMapBufferRange() benefits Macs with Apple gpus enormously.
-
-        //Note (observeur): Other bits such as GL_MAP_INVALIDATE_RANGE_BIT or GL_MAP_UNSYNCHRONIZED_BIT didn't seem to make much of a difference on Apple gpus, so we stick to the simple way.
-        U32 MapBits = GL_MAP_WRITE_BIT;
-
-        //Note (observeur): Using a block size of 0 will call the following block and map the buffer all in once. It doesn't bother Apple machines, it might actually benefit them a little bit. A larger value is also fine. The largest buffers I observed where around 2mb or 3mb while most of buffers are smaller than 50000 bytes.
-        block_size = 524288;
-
-        //Note (observeur): This is called in case block_size is set to 0 (All in one mapping).
-        if(block_size == 0)
+        for (U32 i = start; i <= end; i += block_size)
         {
-            U8 * mptr = NULL;
             LL_PROFILE_ZONE_NAMED_CATEGORY_VERTEX("glBufferSubData block");
             LL_PROFILE_GPU_ZONE("glBufferSubData");
-
-            mptr = (U8*) glMapBufferRange( target, start, size, MapBits);
-
-            if(mptr)
-            {
-                std::memcpy(mptr, (U8*) data, size);
-                glUnmapBuffer(target);
-            }
-            else
-            {
-                LL_WARNS() << "glMapBufferRange() returned NULL" << LL_ENDL;
-            }
-            return;
+            U32 tend = llmin(i + block_size, end);
+            //U32 size = tend - i + 1;
+            glBufferSubData(target, i, tend - i +1, (U8*) data + (i-start));
         }
 
-        //Note (observeur): The following code is executed in case of block_size is superior to 0
-
-        //Note (observeur): This is for analysis purpose only
-        //if(size > block_size)
-        //{
-        //    LL_INFOS() << "Large data range (MB MODE) : " << size << LL_ENDL;
-        //}
+        return;
+    }
 
-        U8 * mptr = NULL;
+    U32 MapBits = GL_MAP_WRITE_BIT;
+    if (mode>2) MapBits = GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT;
 
-        for (U32 i = start; i <= end; i += block_size)
-        {
-            LL_PROFILE_ZONE_NAMED_CATEGORY_VERTEX("glBufferSubData block");
-            LL_PROFILE_GPU_ZONE("glBufferSubData");
-            U32 tend = llmin(i + block_size, end);
-            size = tend - i + 1;
+    U32 buffer_size = end-start+1;
 
-            mptr = (U8*) glMapBufferRange( target, i, size, MapBits );
+    U8 * mptr = NULL;
+    mptr = (U8*) glMapBufferRange( target, start, end-start+1, MapBits);
 
-            if(mptr)
-            {
-                std::memcpy(mptr, (U8*) data + (i-start), size);
-                glUnmapBuffer(target);
-            }
-            else
-            {
-                LL_WARNS() << "glMapBufferRange() returned NULL" << LL_ENDL;
-            }
+    if (mptr)
+    {
+        std::memcpy(mptr, (U8*) data, buffer_size);
+        if(!glUnmapBuffer(target))
+        {
+            LL_WARNS() << "glUnmapBuffer() failed" << LL_ENDL;
         }
     }
+    else
+    {
+        LL_WARNS() << "glMapBufferRange() returned NULL" << LL_ENDL;
+    }
+
 }
 
 void LLVertexBuffer::unmapBuffer()
@@ -1266,13 +1236,13 @@ void LLVertexBuffer::unmapBuffer()
             }
             else
             {
-                flush_vbo(GL_ARRAY_BUFFER, start, end, (U8*)mMappedData + start);
+                flush_vbo(GL_ARRAY_BUFFER, start, end, (U8*)mMappedData + start, sMappingMode);
                 start = region.mStart;
                 end = region.mEnd;
             }
         }
 
-        flush_vbo(GL_ARRAY_BUFFER, start, end, (U8*)mMappedData + start);
+        flush_vbo(GL_ARRAY_BUFFER, start, end, (U8*)mMappedData + start, sMappingMode);
 
         mMappedVertexRegions.clear();
     }
@@ -1300,13 +1270,14 @@ void LLVertexBuffer::unmapBuffer()
             }
             else
             {
-                flush_vbo(GL_ELEMENT_ARRAY_BUFFER, start, end, (U8*)mMappedIndexData + start);
+                flush_vbo(GL_ELEMENT_ARRAY_BUFFER, start, end, (U8*)mMappedIndexData + start, sMappingMode);
+
                 start = region.mStart;
                 end = region.mEnd;
             }
         }
 
-        flush_vbo(GL_ELEMENT_ARRAY_BUFFER, start, end, (U8*)mMappedIndexData + start);
+        flush_vbo(GL_ELEMENT_ARRAY_BUFFER, start, end, (U8*)mMappedIndexData + start, sMappingMode);
 
         mMappedIndexRegions.clear();
     }
@@ -1562,43 +1533,43 @@ void LLVertexBuffer::setupVertexBuffer()
 void LLVertexBuffer::setPositionData(const LLVector4a* data)
 {
     llassert(sGLRenderBuffer == mGLBuffer);
-    flush_vbo(GL_ARRAY_BUFFER, 0, sizeof(LLVector4a) * getNumVerts()-1, (U8*) data);
+    flush_vbo(GL_ARRAY_BUFFER, 0, sizeof(LLVector4a) * getNumVerts()-1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setTexCoordData(const LLVector2* data)
 {
     llassert(sGLRenderBuffer == mGLBuffer);
-    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_TEXCOORD0], mOffsets[TYPE_TEXCOORD0] + sTypeSize[TYPE_TEXCOORD0] * getNumVerts() - 1, (U8*)data);
+    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_TEXCOORD0], mOffsets[TYPE_TEXCOORD0] + sTypeSize[TYPE_TEXCOORD0] * getNumVerts() - 1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setColorData(const LLColor4U* data)
 {
     llassert(sGLRenderBuffer == mGLBuffer);
-    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_COLOR], mOffsets[TYPE_COLOR] + sTypeSize[TYPE_COLOR] * getNumVerts() - 1, (U8*) data);
+    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_COLOR], mOffsets[TYPE_COLOR] + sTypeSize[TYPE_COLOR] * getNumVerts() - 1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setNormalData(const LLVector4a* data)
 {
     llassert(sGLRenderBuffer == mGLBuffer);
-    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_NORMAL], mOffsets[TYPE_NORMAL] + sTypeSize[TYPE_NORMAL] * getNumVerts() - 1, (U8*) data);
+    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_NORMAL], mOffsets[TYPE_NORMAL] + sTypeSize[TYPE_NORMAL] * getNumVerts() - 1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setTangentData(const LLVector4a* data)
 {
     llassert(sGLRenderBuffer == mGLBuffer);
-    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_TANGENT], mOffsets[TYPE_TANGENT] + sTypeSize[TYPE_TANGENT] * getNumVerts() - 1, (U8*) data);
+    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_TANGENT], mOffsets[TYPE_TANGENT] + sTypeSize[TYPE_TANGENT] * getNumVerts() - 1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setWeight4Data(const LLVector4a* data)
 {
     llassert(sGLRenderBuffer == mGLBuffer);
-    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_WEIGHT4], mOffsets[TYPE_WEIGHT4] + sTypeSize[TYPE_WEIGHT4] * getNumVerts() - 1, (U8*) data);
+    flush_vbo(GL_ARRAY_BUFFER, mOffsets[TYPE_WEIGHT4], mOffsets[TYPE_WEIGHT4] + sTypeSize[TYPE_WEIGHT4] * getNumVerts() - 1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setIndexData(const U16* data)
 {
     llassert(sGLRenderIndices == mGLIndices);
-    flush_vbo(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(U16) * getNumIndices() - 1, (U8*) data);
+    flush_vbo(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(U16) * getNumIndices() - 1, (U8*) data, sMappingMode);
 }
 
 void LLVertexBuffer::setIndexData(const U32* data)
@@ -1610,6 +1581,7 @@ void LLVertexBuffer::setIndexData(const U32* data)
         mIndicesStride = 4;
         mNumIndices /= 2;
     }
-    flush_vbo(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(U32) * getNumIndices() - 1, (U8*)data);
+
+    flush_vbo(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(U32) * getNumIndices() - 1, (U8*) data, sMappingMode);
 }
 
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h
index b634609929..184b0a4ac9 100644
--- a/indra/llrender/llvertexbuffer.h
+++ b/indra/llrender/llvertexbuffer.h
@@ -161,7 +161,7 @@ public:
 
     // set for rendering
     // assumes (and will assert on) the following:
-    //      - this buffer has no pending unampBuffer call
+    //      - this buffer has no pending unmapBuffer call
     //      - a shader is currently bound
     //      - This buffer has sufficient attributes within it to satisfy the needs of the currently bound shader
     void    setBuffer();
@@ -267,6 +267,8 @@ public:
     static U32 sGLRenderIndices;
     static U32 sLastMask;
     static U32 sVertexCount;
+
+    static U32 sMappingMode;
 };
 
 #ifdef LL_PROFILER_ENABLE_RENDER_DOC
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 35e2e54217..c3dd2eb17a 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -223,7 +223,7 @@ void LLUI::getMousePositionScreen(S32 *x, S32 *y)
     LLCoordGL cursor_pos_gl(cursor_pos_window.convert());
     *x = ll_round((F32)cursor_pos_gl.mX / getScaleFactor().mV[VX]);
     *y = ll_round((F32)cursor_pos_gl.mY / getScaleFactor().mV[VY]);
-#if defined(LL_DARWIN)
+#if defined(LL_SDL)
     *x = *x * LLView::getWindow()->getSystemUISize();
     *y = *y * LLView::getWindow()->getSystemUISize();
 #endif
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index aff9334cb6..5bb538f892 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -34,6 +34,8 @@
 #include "llinstancetracker.h"
 #include "llsd.h"
 
+#include "../llrender/llglheaders.h"
+
 class LLSplashScreen;
 class LLPreeditor;
 class LLWindowCallbacks;
@@ -243,6 +245,8 @@ protected:
     S32         mMinWindowHeight;
     S32         mRefreshRate;
 
+    GLsync      swapFense;
+
     // Handle a UTF-16 encoding unit received from keyboard.
     // Converting the series of UTF-16 encoding units to UTF-32 data,
     // this method passes the resulting UTF-32 data to mCallback's
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 453905b19b..1b8ab27f23 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -38,6 +38,8 @@
 #include "lldir.h"
 #include "indra_constants.h"
 
+#include "../newview/llviewercontrol.h"
+
 #include <OpenGL/OpenGL.h>
 #include <Carbon/Carbon.h>
 #include <CoreServices/CoreServices.h>
@@ -50,6 +52,8 @@
 #include <IOKit/hid/IOHIDLib.h>
 #include <IOKit/usb/IOUSBLib.h>
 
+
+
 extern BOOL gDebugWindowProc;
 BOOL gHiDPISupport = TRUE;
 
@@ -1009,6 +1013,19 @@ BOOL LLWindowMacOSX::setSizeImpl(const LLCoordWindow size)
 void LLWindowMacOSX::swapBuffers()
 {
     CGLFlushDrawable(mContext);
+
+    U32 mode = gSavedSettings.getU32("MPVBufferOptiMode");
+    if (mode == 0)
+    {
+        if(gGLManager.mIsApple) mode = 2;
+        else mode = 1;
+    }
+    if (mode > 2)
+    {
+        glClientWaitSync(swapFense, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
+        glDeleteSync(swapFense);
+        swapFense = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    }
 }
 
 void LLWindowMacOSX::restoreGLContext()
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index eb689dc48c..cdd9cbd99a 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1255,6 +1255,18 @@ void LLWindowSDL::swapBuffers()
     if (mWindow)
     {
         SDL_GL_SwapWindow( mWindow );
+        U32 mode = gSavedSettings.getU32("MPVBuffMapMode");
+        if (mode == 0)
+        {
+            if(gGLManager.mIsApple) mode = 2;
+            else mode = 1;
+        }
+        if (mode > 2)
+        {
+            glClientWaitSync(swapFense, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
+            glDeleteSync(swapFense);
+            swapFense = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+        }
     }
 }
 
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 96c066ca6d..5fbe5be626 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -111,12 +111,14 @@ if (DARWIN)
 endif (DARWIN)
 
 if (INSTALL)
-	if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
-		set(_LIB lib/${ARCH}-linux-gnu)
-	elseif (EXISTS /lib64)
-		set(_LIB lib64)
-	else ()
-		set(_LIB lib)
-	endif ()
-	install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
-endif ()
+    if (DARWIN)
+        set(_LIB ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/llplugin)
+    elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+        set(_LIB lib/${ARCH}-linux-gnu)
+    elseif (EXISTS /lib64)
+        set(_LIB lib64)
+    else (DARWIN)
+        set(_LIB lib)
+    endif (DARWIN)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
+endif (INSTALL)
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 7881dbba73..1140f2de1b 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -50,12 +50,14 @@ if (DARWIN)
 endif (DARWIN)
 
 if (INSTALL)
-	if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
-		set(_LIB lib/${ARCH}-linux-gnu)
-	elseif (EXISTS /lib64)
-		set(_LIB lib64)
-	else ()
-		set(_LIB lib)
-	endif ()
-	install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
-endif ()
+    if (DARWIN)
+        set(_LIB ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/llplugin)
+    elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+        set(_LIB lib/${ARCH}-linux-gnu)
+    elseif (EXISTS /lib64)
+        set(_LIB lib64)
+    else (DARWIN)
+        set(_LIB lib)
+    endif (DARWIN)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
+endif (INSTALL)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d282557efc..701f8b9c94 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2166,6 +2166,7 @@ if (DARWIN)
      "${VIEWER_APP_BUNDLE}/Contents/Info.plist"
     )
 
+  if (NOT INSTALL)
   add_custom_command(
     TARGET ${VIEWER_BINARY_NAME} POST_BUILD
     COMMAND ${PYTHON_EXECUTABLE}
@@ -2190,6 +2191,7 @@ if (DARWIN)
       ${VIEWER_BINARY_NAME}
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
+  endif (NOT INSTALL)
 
   if (ENABLE_MEDIA_PLUGINS)
       if (DARWIN OR LINUX)
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
new file mode 100644
index 0000000000..73806642e4
--- /dev/null
+++ b/indra/newview/FixBundle.cmake.in
@@ -0,0 +1,7 @@
+include(BundleUtilities)
+
+set(dirs
+    /opt/local/lib
+   )
+
+fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}")
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index e648d8cc47..7d9f160467 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -1,3 +1,59 @@
+if (DARWIN)
+
+    install(DIRECTORY
+        English.lproj
+        German.lproj
+        Japanese.lproj
+        Korean.lproj
+        app_settings
+        character
+        cursors_mac
+        da.lproj
+        es.lproj
+        fonts
+        fr.lproj
+        uk.lproj
+        hu.lproj
+        it.lproj
+        nl.lproj
+        pl.lproj
+        pt.lproj
+        ru.lproj
+        skins
+        tr.lproj
+        zh-Hans.lproj
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        )
+
+    install(FILES
+        SecondLife.nib
+        ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
+        cube.dae
+        featuretable_mac.txt
+        secondlife.icns
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        )
+
+    install(FILES
+        licenses-mac.txt
+        RENAME licenses.txt
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        )
+
+    install(FILES
+        ${SCRIPTS_DIR}/messages/message_template.msg
+        ${SCRIPTS_DIR}/../etc/message.xml
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/app_settings
+        )
+
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake
+        )
+    install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
+
+else (DARWIN)
+
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}
         DESTINATION bin
         )
@@ -16,15 +72,19 @@ if (LINUX)
         endif ()
         install(FILES
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so
+                DESTINATION ${_LIB})
+        if (USE_FMODSTUDIO)
+            install(FILES
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.22
-                DESTINATION ${_LIB})
+             DESTINATION ${_LIB})
+        endif (USE_FMODSTUDIO)
         install(PROGRAMS
                 ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox
                 DESTINATION libexec/${VIEWER_BINARY_NAME}
-		#PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE
-		#GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+                #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                #GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
         )
         install(PROGRAMS
                 ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host
@@ -65,10 +125,16 @@ else (IS_ARTWORK_PRESENT)
   message(STATUS "WARNING: Artwork is not present, and will not be installed")
 endif (IS_ARTWORK_PRESENT)
 
-install(FILES featuretable_linux.txt
-        #featuretable_solaris.txt
-        licenses.txt
+    install(FILES
         ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
+        featuretable_linux.txt
+        #featuretable_solaris.txt
+        DESTINATION share/${VIEWER_BINARY_NAME}
+        )
+
+    install(FILES
+        licenses-linux.txt
+        RENAME licenses.txt
         DESTINATION share/${VIEWER_BINARY_NAME}
         )
 
@@ -77,6 +143,8 @@ install(FILES ${SCRIPTS_DIR}/messages/message_template.msg
         DESTINATION share/${VIEWER_BINARY_NAME}/app_settings
         )
 
-install(FILES linux_tools/${VIEWER_BINARY_NAME}.desktop
+    install(FILES linux_tools/${VIEWER_BINARY_NAME}.desktop
         DESTINATION share/applications
         )
+
+endif (DARWIN)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6355d02bc9..d132e81e20 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13496,6 +13496,17 @@
       <key>Value</key>
       <real>0</real>
     </map>
+    <key>MaxFPS</key>
+    <map>
+      <key>Comment</key>
+      <string>FPS Limiter.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>ZoomDirect</key>
     <map>
       <key>Comment</key>
@@ -13755,6 +13766,23 @@
             <real>12</real>
         </map>
 
+
+    <!-- megapahit settings -->
+    <key>MPVBufferOptiMode</key>
+    <map>
+      <key>Comment</key>
+      <string>
+      OpenGL buffer mapping mode:
+      0:auto, 1:normal, 2:optimised, 3:unsynchronized.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+
+
     <!-- Settings below are for back compatibility only.
     They are not used in current viewer anymore. But they can't be removed to avoid
     influence on previous versions of the viewer in case of settings are not used or default value
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 768d131073..975935ee6f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -256,6 +256,8 @@ using namespace LL;
 #include "llcoproceduremanager.h"
 #include "llviewereventrecorder.h"
 
+#include <chrono>
+
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either
 // this app, or another 'component' of the viewer. App globals should be
@@ -1370,9 +1372,10 @@ bool LLAppViewer::doFrame()
 {
     static LLCachedControl<U32> fpsLimitMaxFps(gSavedSettings, "MaxFPS", 0);
 
+    using TimePoint = std::chrono::steady_clock::time_point;
+
     U64 fpsLimitSleepFor = 0;
-    U64 fpsLimitFrameStartTime = 0;
-    if(fpsLimitMaxFps > 0) fpsLimitFrameStartTime = LLTrace::BlockTimer::getCPUClockCount64();
+    TimePoint fpsLimitFrameStartTime = std::chrono::steady_clock::now();
 
     LL_RECORD_BLOCK_TIME(FTM_FRAME);
     {
@@ -1546,12 +1549,13 @@ bool LLAppViewer::doFrame()
 
         if(fpsLimitMaxFps > 0)
         {
-            U64 fpsLimitFrameTime = LLTrace::BlockTimer::getCPUClockCount64() - fpsLimitFrameStartTime;
-            U64 desired_time_ns = (U32)(1000000.f / fpsLimitMaxFps);
+            auto elapsed = std::chrono::steady_clock::now() - fpsLimitFrameStartTime;
 
-            if((fpsLimitFrameTime+1000) < desired_time_ns)
+            long long fpsLimitFrameTime = std::chrono::duration_cast<std::chrono::microseconds>(elapsed).count();
+            U64 desired_time_us = (U32)(1000000.f / fpsLimitMaxFps);
+            if((fpsLimitFrameTime+1000) < desired_time_us)
             {
-                fpsLimitSleepFor = (desired_time_ns - fpsLimitFrameTime - 1000) * 1.0;
+                fpsLimitSleepFor = (desired_time_us - fpsLimitFrameTime - 1000) * 1.0;
             }
         }
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index a0a625c5fc..eecf9c60b6 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -166,7 +166,9 @@ BOOL LLStatusBar::postBuild()
     gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3));
 
     mTextTime = getChild<LLTextBox>("TimeText" );
-    mTextFps = getChild<LLTextBox>("FpsText");
+
+    mTextFps = getChild<LLButton>("FpsText");
+    mTextFps->setClickedCallback( &LLStatusBar::onClickFps, this );
 
     getChild<LLUICtrl>("buyL")->setCommitCallback(
         boost::bind(&LLStatusBar::onClickBuyCurrency, this));
@@ -306,7 +308,8 @@ void LLStatusBar::refresh()
 
         S32 fps = (S32) llround(LLTrace::get_frame_recording().getPeriodMedianPerSec(LLStatViewer::FPS, 50));
         std::string fpsStr = std::to_string(fps);
-        mTextFps->setText(fpsStr);
+        //mTextFps->setText(fpsStr);
+        mTextFps->setLabel(fpsStr);
     }
 
     // update clock every 10 seconds
@@ -649,6 +652,12 @@ void LLStatusBar::onClickMediaToggle(void* data)
     LLViewerMedia::getInstance()->setAllMediaPaused(pause);
 }
 
+//static
+void LLStatusBar::onClickFps(void* data)
+{
+    LLFloaterReg::toggleInstance("mpv_performance");
+}
+
 BOOL can_afford_transaction(S32 cost)
 {
     return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index da3c4a71f1..650d7d6c40 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -109,6 +109,8 @@ private:
     static void onClickMediaToggle(void* data);
     static void onClickBalance(void* data);
 
+    static void onClickFps(void* data);
+
     LLSearchEditor *mFilterEdit;
     LLPanel *mSearchPanel;
     void onUpdateFilterTerm();
@@ -121,7 +123,7 @@ private:
 
 private:
     LLTextBox   *mTextTime;
-    LLTextBox   *mTextFps;
+    LLButton    *mTextFps;
 
     LLStatGraph *mSGBandwidth;
     LLStatGraph *mSGPacketLoss;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index ceda2675d5..9ec5f4f122 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -81,6 +81,7 @@
 #include "llfloatergroups.h"
 #include "llfloaterhelpbrowser.h"
 #include "llfloaterhoverheight.h"
+#include "mpvfloatertuning.h"
 #include "llfloaterhowto.h"
 #include "llfloaterhud.h"
 #include "llfloaterimagepreview.h"
@@ -380,6 +381,9 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("edit_hover_height", "floater_edit_hover_height.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHoverHeight>);
     LLFloaterReg::add("hud", "floater_hud.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHUD>);
 
+    LLFloaterReg::add("mpv_performance", "floater_mpv_performance.xml", (LLFloaterBuildFunc)&
+    LLFloaterReg::build<MPVFloaterTuning>);
+
     LLFloaterReg::add("impanel", "floater_im_session.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterIMSession>);
     LLFloaterReg::add("im_container", "floater_im_container.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterIMContainer>);
     LLFloaterReg::add("im_well_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLIMWellWindow>);
diff --git a/indra/newview/mpvfloatertuning.cpp b/indra/newview/mpvfloatertuning.cpp
new file mode 100644
index 0000000000..177bd3caa7
--- /dev/null
+++ b/indra/newview/mpvfloatertuning.cpp
@@ -0,0 +1,90 @@
+/**
+* @file mpvfloatertuning.cpp
+* @brief Controller for viewer tuning
+* @author observeur@megapahit.net
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "mpvfloatertuning.h"
+#include "llsliderctrl.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llviewercontrol.h"
+#include "llsdserialize.h"
+
+#include "../llrender/llvertexbuffer.cpp"
+
+MPVFloaterTuning::MPVFloaterTuning(const LLSD& key) : LLFloater(key)
+{
+}
+
+void MPVFloaterTuning::syncFromPreferenceSetting(void *user_data)
+{
+    MPVFloaterTuning *self = static_cast<MPVFloaterTuning*>(user_data);
+
+    U32 fps = gSavedSettings.getU32("MaxFPS");
+    LLSliderCtrl* fpsSliderCtrl = self->getChild<LLSliderCtrl>("fpsSlider");
+    fpsSliderCtrl->setValue(fps,FALSE);
+
+    U32 optBuf = gSavedSettings.getU32("MPVBufferOptiMode");
+    LLComboBox * optBufCtrl = self->getChild<LLComboBox>("MPVBuffModeComboBox");
+    optBufCtrl->setCurrentByIndex(optBuf);
+
+    LL_INFOS() << "syncFromPreferenceSetting optBuf=" << optBuf << LL_ENDL;
+}
+
+BOOL MPVFloaterTuning::postBuild()
+{
+    LLSliderCtrl* fpsSliderCtrl = getChild<LLSliderCtrl>("fpsSlider");
+    fpsSliderCtrl->setMinValue(0);
+    fpsSliderCtrl->setMaxValue(165);
+    fpsSliderCtrl->setSliderMouseUpCallback(boost::bind(&MPVFloaterTuning::onFinalCommit,this));
+
+    LLComboBox* optBufCtrl = getChild<LLComboBox>("MPVBuffModeComboBox");
+    optBufCtrl->setCommitCallback(boost::bind(&MPVFloaterTuning::onFinalCommit,this));
+
+    syncFromPreferenceSetting(this);
+
+    return TRUE;
+}
+
+// Do send-to-the-server work when slider drag completes, or new
+// value entered as text.
+void MPVFloaterTuning::onFinalCommit()
+{
+    LLSliderCtrl* fpsSliderCtrl = getChild<LLSliderCtrl>("fpsSlider");
+    U32 fps = (U32)fpsSliderCtrl->getValueF32();
+    gSavedSettings.setU32("MaxFPS",fps);
+
+    LLComboBox* optBufCtrl = getChild<LLComboBox>("MPVBuffModeComboBox");
+    S16 optBuf = optBufCtrl->getCurrentIndex();
+    gSavedSettings.setU32("MPVBufferOptiMode",optBuf);
+
+    LLVertexBuffer::sMappingMode = optBuf;
+}
+
+void MPVFloaterTuning::onClose(bool app_quitting)
+{
+}
\ No newline at end of file
diff --git a/indra/newview/mpvfloatertuning.h b/indra/newview/mpvfloatertuning.h
new file mode 100644
index 0000000000..ed91317eab
--- /dev/null
+++ b/indra/newview/mpvfloatertuning.h
@@ -0,0 +1,48 @@
+/**
+* @file mpvfloatertuning.h
+* @brief Controller for viewer tuning
+* @author observeur@megapahit.net
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_MPVFLOATERTUNING_H
+#define LL_MPVFLOATERTUNING_H
+
+#include "llfloater.h"
+
+class MPVFloaterTuning: public LLFloater
+{
+public:
+    MPVFloaterTuning(const LLSD& key);
+
+    BOOL postBuild();
+
+    void onFinalCommit();
+
+    static void syncFromPreferenceSetting(void *user_data);
+
+    //void updateEditEnabled();
+
+    /*virtual*/ void onClose(bool app_quitting);
+};
+
+#endif
diff --git a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
new file mode 100644
index 0000000000..5c54d366f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ positioning="cascading"
+ legacy_header_height="40"
+ top="12"
+ right="2"
+ height="120"
+ min_height="120"
+ width="320"
+ min_width="320"
+ can_minimize="true"
+ can_close="true"
+ can_resize="false"
+ layout="topright"
+ name="mpv_performance"
+ single_instance="true"
+ save_rect="true"
+ save_visibility="true"
+ title="Megapahit Tuning">
+
+ <panel
+     name="panel_fps"
+     border="false"
+     width="300"
+     height="36"
+     left="10"
+     top="40"
+     follows="top|left"
+     layout="topleft"
+     >
+
+     <slider
+     name="fpsSlider"
+     width="300"
+     height="15"
+     layout="topleft"
+     enabled="true"
+     control_name="fpsSlider"
+     decimal_digits="0"
+     increment="5"
+     initial_value="0"
+     label="Max FPS"
+     label_width="50"
+     text_width="30"
+     can_edit_text="false"
+     show_text="true"
+     >
+     </slider>
+
+    </panel>
+
+    <panel
+     name="panel_mapping"
+     border="false"
+     width="300"
+     height="36"
+     left="10"
+     top="78"
+     follows="top|left"
+     layout="topleft"
+     >
+
+    <text
+     name="MPVBuffModeLabel"
+     width="100"
+     height="15"
+     left="2"
+     top="8">
+     Buffer mapping:
+    </text>
+
+    <combo_box
+     control_name="MPVBuffModeControl"
+     name="MPVBuffModeComboBox"
+     width="150"
+     height="23"
+     left="120"
+     top="4"
+     >
+        <combo_box.item
+         enabled="true"
+         label="Auto"
+         name="Auto"
+         value="0" />
+        <combo_box.item
+         enabled="true"
+         label="Normal"
+         name="Normal"
+         value="1" />
+        <combo_box.item
+         enabled="true"
+         label="Optimized (Apple GPU)"
+         name="Optimized"
+         value="2" />
+        <combo_box.item
+         enabled="true"
+         label="Optimized+ (AMD GPU)"
+         name="Optimized+"
+         value="3" />
+    </combo_box>
+
+    </panel>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index dbc181855f..f337ad9038 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -55,11 +55,11 @@
 		 text_pad_left="6"
 		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
 		 top="0">
-			<search_button 
+			<search_button
 			 top_pad="4"
-			 left_pad="4" 
+			 left_pad="4"
 			 width="12"
-			 height="12" 
+			 height="12"
 			 image_unselected="Search"
 			 image_selected="Search"/>
 			<clear_button
@@ -77,20 +77,20 @@
     left="-398"
     width="185"
     top="1"
-    follows="right|top" 
+    follows="right|top"
     name="balance_bg">
     <text
      halign="center"
      font="SansSerifSmall"
      follows="all"
      height="18"
-     left="0" 
+     left="0"
      name="balance"
      tool_tip="Click to refresh your L$ balance"
      v_pad="4"
      top="0"
-     wrap="false" 
-     value="L$??" 
+     wrap="false"
+     value="L$??"
      width="40" />
     <button
      halign="center"
@@ -185,7 +185,7 @@
      top="2"
      name="volume_btn"
      width="16" />
-      <text
+     <button
      type="string"
      font="SansSerif"
      text_color="FpsTextColor"
@@ -195,10 +195,10 @@
      height="18"
      top="1"
      v_pad="0"
-     left_pad="0"
+     left_pad="4"
      name="FpsText"
      tool_tip="fps"
-     width="40">
+     width="32">
      60
      </text>
 </panel>