Merge branch develop into project/fonts-update

# Conflicts:
#	indra/llrender/llfontfreetype.cpp

19 files changed, 820 insertions, 1388 deletions

diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 2996f58fe0..08b3df87ab 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -63,8 +63,8 @@ set(llwindow_LINK_LIBRARIES
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 if (LINUX)
-  list(APPEND viewer_SOURCE_FILES 
-       llkeyboardsdl.cpp 
+  list(APPEND viewer_SOURCE_FILES
+       llkeyboardsdl.cpp
        llwindowsdl.cpp
        )
   list(APPEND viewer_HEADER_FILES
@@ -107,7 +107,7 @@ if (DARWIN)
       llkeyboardmacosx.cpp
       llwindowmacosx.cpp
       PROPERTIES
-      COMPILE_FLAGS "-Wno-deprecated-declarations -fpascal-strings"
+      COMPILE_FLAGS "-fpascal-strings"
       )
 endif (DARWIN)
 
@@ -180,9 +180,7 @@ endif (SDL_FOUND)
 
   target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
   target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-  
+
 if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(CARBON_LIBRARY Carbon)
   target_link_libraries(llwindow ${CARBON_LIBRARY})
 endif (DARWIN)
diff --git a/indra/llwindow/llappdelegate-objc.h b/indra/llwindow/llappdelegate-objc.h
index ef36f7d4a8..5b6e11e4e4 100644
--- a/indra/llwindow/llappdelegate-objc.h
+++ b/indra/llwindow/llappdelegate-objc.h
@@ -36,16 +36,17 @@
     std::string secondLogPath;
 }
 
-@property (assign) IBOutlet LLNSWindow *window;
-@property (assign) IBOutlet NSWindow *inputWindow;
-@property (assign) IBOutlet LLNonInlineTextView *inputView;
+@property (assign) IBOutlet LLNSWindow * _Nullable window;
+@property (assign) IBOutlet NSWindow * _Nullable inputWindow;
+@property (assign) IBOutlet LLNonInlineTextView * _Nullable inputView;
 
-@property (retain) NSString *currentInputLanguage;
+@property (retain) NSString * _Nullable currentInputLanguage;
 
 - (void) oneFrame;
-- (void) showInputWindow:(bool)show withEvent:(NSEvent*)textEvent;
+- (void) showInputWindow:(bool)show withEvent:(nullable NSEvent *)textEvent;
 - (void) languageUpdated;
 - (bool) romanScript;
+- (void) setBugsplatValue:(nullable NSString *)value forAttribute:(nullable NSString *)attribute;
 @end
 
 @interface LLApplication : NSApplication
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index 4bc069c5a4..ff85b2cb14 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -47,7 +47,6 @@
 #include "llstl.h"
 #include "lltimer.h"
 
-void (*gWriteDebug)(const char* msg) = NULL;
 LLDXHardware gDXHardware;
 
 //-----------------------------------------------------------------------------
@@ -61,170 +60,6 @@ typedef BOOL ( WINAPI* PfnCoSetProxyBlanket )( IUnknown* pProxy, DWORD dwAuthnSv
                                                OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel,
                                                RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities );
 
-HRESULT GetVideoMemoryViaWMI(WCHAR* strInputDeviceID, DWORD* pdwAdapterRam)
-{
-    HRESULT hr;
-    bool bGotMemory = false;
-    IWbemLocator* pIWbemLocator = nullptr;
-    IWbemServices* pIWbemServices = nullptr;
-    BSTR pNamespace = nullptr;
-
-    *pdwAdapterRam = 0;
-    CoInitializeEx(0, COINIT_APARTMENTTHREADED);
-
-    hr = CoCreateInstance( CLSID_WbemLocator,
-                           nullptr,
-                           CLSCTX_INPROC_SERVER,
-                           IID_IWbemLocator,
-                           ( LPVOID* )&pIWbemLocator );
-#ifdef PRINTF_DEBUGGING
-    if( FAILED( hr ) ) wprintf( L"WMI: CoCreateInstance failed: 0x%0.8x\n", hr );
-#endif
-
-    if( SUCCEEDED( hr ) && pIWbemLocator )
-    {
-        // Using the locator, connect to WMI in the given namespace.
-        pNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );
-
-        hr = pIWbemLocator->ConnectServer( pNamespace, nullptr, nullptr, 0L,
-                                           0L, nullptr, nullptr, &pIWbemServices );
-#ifdef PRINTF_DEBUGGING
-        if( FAILED( hr ) ) wprintf( L"WMI: pIWbemLocator->ConnectServer failed: 0x%0.8x\n", hr );
-#endif
-        if( SUCCEEDED( hr ) && pIWbemServices != 0 )
-        {
-            HINSTANCE hinstOle32 = nullptr;
-
-            hinstOle32 = LoadLibraryW( L"ole32.dll" );
-            if( hinstOle32 )
-            {
-                PfnCoSetProxyBlanket pfnCoSetProxyBlanket = nullptr;
-
-                pfnCoSetProxyBlanket = ( PfnCoSetProxyBlanket )GetProcAddress( hinstOle32, "CoSetProxyBlanket" );
-                if( pfnCoSetProxyBlanket != 0 )
-                {
-                    // Switch security level to IMPERSONATE.
-                    pfnCoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, nullptr,
-                                          RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, 0 );
-                }
-
-                FreeLibrary( hinstOle32 );
-            }
-
-            IEnumWbemClassObject* pEnumVideoControllers = nullptr;
-            BSTR pClassName = nullptr;
-
-            pClassName = SysAllocString( L"Win32_VideoController" );
-
-            hr = pIWbemServices->CreateInstanceEnum( pClassName, 0,
-                                                     nullptr, &pEnumVideoControllers );
-#ifdef PRINTF_DEBUGGING
-            if( FAILED( hr ) ) wprintf( L"WMI: pIWbemServices->CreateInstanceEnum failed: 0x%0.8x\n", hr );
-#endif
-
-            if( SUCCEEDED( hr ) && pEnumVideoControllers )
-            {
-                IWbemClassObject* pVideoControllers[10] = {0};
-                DWORD uReturned = 0;
-                BSTR pPropName = nullptr;
-
-                // Get the first one in the list
-                pEnumVideoControllers->Reset();
-                hr = pEnumVideoControllers->Next( 5000,             // timeout in 5 seconds
-                                                  10,                  // return the first 10
-                                                  pVideoControllers,
-                                                  &uReturned );
-#ifdef PRINTF_DEBUGGING
-                if( FAILED( hr ) ) wprintf( L"WMI: pEnumVideoControllers->Next failed: 0x%0.8x\n", hr );
-                if( uReturned == 0 ) wprintf( L"WMI: pEnumVideoControllers uReturned == 0\n" );
-#endif
-
-                VARIANT var;
-                if( SUCCEEDED( hr ) )
-                {
-                    bool bFound = false;
-                    for( UINT iController = 0; iController < uReturned; iController++ )
-                    {
-                        if ( !pVideoControllers[iController] )
-                            continue;
-
-                        // if strInputDeviceID is set find this specific device and return memory or specific device
-                        // if strInputDeviceID is not set return the best device
-                        if (strInputDeviceID)
-                        {
-                            pPropName = SysAllocString( L"PNPDeviceID" );
-                            hr = pVideoControllers[iController]->Get( pPropName, 0L, &var, nullptr, nullptr );
-#ifdef PRINTF_DEBUGGING
-                            if( FAILED( hr ) )
-                                wprintf( L"WMI: pVideoControllers[iController]->Get PNPDeviceID failed: 0x%0.8x\n", hr );
-#endif
-                            if( SUCCEEDED( hr ) && strInputDeviceID)
-                            {
-                                if( wcsstr( var.bstrVal, strInputDeviceID ) != 0 )
-                                    bFound = true;
-                            }
-                            VariantClear( &var );
-                            if( pPropName ) SysFreeString( pPropName );
-                        }
-
-                        if( bFound || !strInputDeviceID )
-                        {
-                            pPropName = SysAllocString( L"AdapterRAM" );
-                            hr = pVideoControllers[iController]->Get( pPropName, 0L, &var, nullptr, nullptr );
-#ifdef PRINTF_DEBUGGING
-                            if( FAILED( hr ) )
-                                wprintf( L"WMI: pVideoControllers[iController]->Get AdapterRAM failed: 0x%0.8x\n",
-                                         hr );
-#endif
-                            if( SUCCEEDED( hr ) )
-                            {
-                                bGotMemory = true;
-                                *pdwAdapterRam = llmax(var.ulVal, *pdwAdapterRam);
-                            }
-                            VariantClear( &var );
-                            if( pPropName ) SysFreeString( pPropName );
-                        }
-
-                        SAFE_RELEASE( pVideoControllers[iController] );
-
-                        if (bFound)
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if( pClassName )
-                SysFreeString( pClassName );
-            SAFE_RELEASE( pEnumVideoControllers );
-        }
-
-        if( pNamespace )
-            SysFreeString( pNamespace );
-        SAFE_RELEASE( pIWbemServices );
-    }
-
-    SAFE_RELEASE( pIWbemLocator );
-
-    CoUninitialize();
-
-    if( bGotMemory )
-        return S_OK;
-    else
-        return E_FAIL;
-}
-
-//static
-U32 LLDXHardware::getMBVideoMemoryViaWMI()
-{
-    DWORD vram = 0;
-    if (SUCCEEDED(GetVideoMemoryViaWMI(NULL, &vram)))
-    {
-        return vram / (1024 * 1024);;
-    }
-    return 0;
-}
 
 //Getting the version of graphics controller driver via WMI
 std::string LLDXHardware::getDriverVersionWMI(EGPUVendor vendor)
@@ -477,498 +312,17 @@ std::string get_string(IDxDiagContainer *containerp, const WCHAR *wszPropName)
     WCHAR wszPropValue[256];
     get_wstring(containerp, wszPropName, wszPropValue, 256);
 
-    return utf16str_to_utf8str(wszPropValue);
-}
-
-
-LLVersion::LLVersion()
-{
-    mValid = false;
-    S32 i;
-    for (i = 0; i < 4; i++)
-    {
-        mFields[i] = 0;
-    }
-}
-
-bool LLVersion::set(const std::string &version_string)
-{
-    S32 i;
-    for (i = 0; i < 4; i++)
-    {
-        mFields[i] = 0;
-    }
-    // Split the version string.
-    std::string str(version_string);
-    typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-    boost::char_separator<char> sep(".", "", boost::keep_empty_tokens);
-    tokenizer tokens(str, sep);
-
-    tokenizer::iterator iter = tokens.begin();
-    S32 count = 0;
-    for (;(iter != tokens.end()) && (count < 4);++iter)
-    {
-        mFields[count] = atoi(iter->c_str());
-        count++;
-    }
-    if (count < 4)
-    {
-        //LL_WARNS() << "Potentially bogus version string!" << version_string << LL_ENDL;
-        for (i = 0; i < 4; i++)
-        {
-            mFields[i] = 0;
-        }
-        mValid = false;
-    }
-    else
-    {
-        mValid = true;
-    }
-    return mValid;
-}
-
-S32 LLVersion::getField(const S32 field_num)
-{
-    if (!mValid)
-    {
-        return -1;
-    }
-    else
-    {
-        return mFields[field_num];
-    }
-}
-
-std::string LLDXDriverFile::dump()
-{
-    if (gWriteDebug)
-    {
-        gWriteDebug("Filename:");
-        gWriteDebug(mName.c_str());
-        gWriteDebug("\n");
-        gWriteDebug("Ver:");
-        gWriteDebug(mVersionString.c_str());
-        gWriteDebug("\n");
-        gWriteDebug("Date:");
-        gWriteDebug(mDateString.c_str());
-        gWriteDebug("\n");
-    }
-    LL_INFOS() << mFilepath << LL_ENDL;
-    LL_INFOS() << mName << LL_ENDL;
-    LL_INFOS() << mVersionString << LL_ENDL;
-    LL_INFOS() << mDateString << LL_ENDL;
-
-    return "";
-}
-
-LLDXDevice::~LLDXDevice()
-{
-    for_each(mDriverFiles.begin(), mDriverFiles.end(), DeletePairedPointer());
-    mDriverFiles.clear();
-}
-
-std::string LLDXDevice::dump()
-{
-    if (gWriteDebug)
-    {
-        gWriteDebug("StartDevice\n");
-        gWriteDebug("DeviceName:");
-        gWriteDebug(mName.c_str());
-        gWriteDebug("\n");
-        gWriteDebug("PCIString:");
-        gWriteDebug(mPCIString.c_str());
-        gWriteDebug("\n");
-    }
-    LL_INFOS() << LL_ENDL;
-    LL_INFOS() << "DeviceName:" << mName << LL_ENDL;
-    LL_INFOS() << "PCIString:" << mPCIString << LL_ENDL;
-    LL_INFOS() << "Drivers" << LL_ENDL;
-    LL_INFOS() << "-------" << LL_ENDL;
-    for (driver_file_map_t::iterator iter = mDriverFiles.begin(),
-             end = mDriverFiles.end();
-         iter != end; iter++)
-    {
-        LLDXDriverFile *filep = iter->second;
-        filep->dump();
-    }
-    if (gWriteDebug)
-    {
-        gWriteDebug("EndDevice\n");
-    }
-
-    return "";
-}
-
-LLDXDriverFile *LLDXDevice::findDriver(const std::string &driver)
-{
-    for (driver_file_map_t::iterator iter = mDriverFiles.begin(),
-             end = mDriverFiles.end();
-         iter != end; iter++)
-    {
-        LLDXDriverFile *filep = iter->second;
-        if (!utf8str_compare_insensitive(filep->mName,driver))
-        {
-            return filep;
-        }
-    }
-
-    return NULL;
+    return ll_convert<std::string>(std::wstring(wszPropValue));
 }
 
 LLDXHardware::LLDXHardware()
 {
-    mVRAM = 0;
-    gWriteDebug = NULL;
 }
 
 void LLDXHardware::cleanup()
 {
-  // for_each(mDevices.begin(), mDevices.end(), DeletePairedPointer());
-  // mDevices.clear();
 }
 
-/*
-std::string LLDXHardware::dumpDevices()
-{
-    if (gWriteDebug)
-    {
-        gWriteDebug("\n");
-        gWriteDebug("StartAllDevices\n");
-    }
-    for (device_map_t::iterator iter = mDevices.begin(),
-             end = mDevices.end();
-         iter != end; iter++)
-    {
-        LLDXDevice *devicep = iter->second;
-        devicep->dump();
-    }
-    if (gWriteDebug)
-    {
-        gWriteDebug("EndAllDevices\n\n");
-    }
-    return "";
-}
-
-LLDXDevice *LLDXHardware::findDevice(const std::string &vendor, const std::string &devices)
-{
-    // Iterate through different devices tokenized in devices string
-    std::string str(devices);
-    typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-    boost::char_separator<char> sep("|", "", boost::keep_empty_tokens);
-    tokenizer tokens(str, sep);
-
-    tokenizer::iterator iter = tokens.begin();
-    for (;iter != tokens.end();++iter)
-    {
-        std::string dev_str = *iter;
-        for (device_map_t::iterator iter = mDevices.begin(),
-                 end = mDevices.end();
-             iter != end; iter++)
-        {
-            LLDXDevice *devicep = iter->second;
-            if ((devicep->mVendorID == vendor)
-                && (devicep->mDeviceID == dev_str))
-            {
-                return devicep;
-            }
-        }
-    }
-
-    return NULL;
-}
-*/
-
-bool LLDXHardware::getInfo(bool vram_only)
-{
-    LLTimer hw_timer;
-    bool ok = false;
-    HRESULT       hr;
-
-    // CLSID_DxDiagProvider does not work with Multithreaded?
-    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-
-    IDxDiagProvider *dx_diag_providerp = NULL;
-    IDxDiagContainer *dx_diag_rootp = NULL;
-    IDxDiagContainer *devices_containerp = NULL;
-    // IDxDiagContainer *system_device_containerp= NULL;
-    IDxDiagContainer *device_containerp = NULL;
-    IDxDiagContainer *file_containerp = NULL;
-    IDxDiagContainer *driver_containerp = NULL;
-    DWORD dw_device_count;
-
-    mVRAM = 0;
-
-    // CoCreate a IDxDiagProvider*
-    LL_DEBUGS("AppInit") << "CoCreateInstance IID_IDxDiagProvider" << LL_ENDL;
-    hr = CoCreateInstance(CLSID_DxDiagProvider,
-                          NULL,
-                          CLSCTX_INPROC_SERVER,
-                          IID_IDxDiagProvider,
-                          (LPVOID*) &dx_diag_providerp);
-
-    if (FAILED(hr))
-    {
-        LL_WARNS("AppInit") << "No DXDiag provider found!  DirectX 9 not installed!" << LL_ENDL;
-        gWriteDebug("No DXDiag provider found!  DirectX 9 not installed!\n");
-        goto LCleanup;
-    }
-    if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
-    {
-        // Fill out a DXDIAG_INIT_PARAMS struct and pass it to IDxDiagContainer::Initialize
-        // Passing in TRUE for bAllowWHQLChecks, allows dxdiag to check if drivers are
-        // digital signed as logo'd by WHQL which may connect via internet to update
-        // WHQL certificates.
-        DXDIAG_INIT_PARAMS dx_diag_init_params;
-        ZeroMemory(&dx_diag_init_params, sizeof(DXDIAG_INIT_PARAMS));
-
-        dx_diag_init_params.dwSize                  = sizeof(DXDIAG_INIT_PARAMS);
-        dx_diag_init_params.dwDxDiagHeaderVersion   = DXDIAG_DX9_SDK_VERSION;
-        dx_diag_init_params.bAllowWHQLChecks        = TRUE;
-        dx_diag_init_params.pReserved               = NULL;
-
-        LL_DEBUGS("AppInit") << "dx_diag_providerp->Initialize" << LL_ENDL;
-        hr = dx_diag_providerp->Initialize(&dx_diag_init_params);
-        if(FAILED(hr))
-        {
-            goto LCleanup;
-        }
-
-        LL_DEBUGS("AppInit") << "dx_diag_providerp->GetRootContainer" << LL_ENDL;
-        hr = dx_diag_providerp->GetRootContainer( &dx_diag_rootp );
-        if(FAILED(hr) || !dx_diag_rootp)
-        {
-            goto LCleanup;
-        }
-
-        HRESULT hr;
-
-        // Get display driver information
-        LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer" << LL_ENDL;
-        hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
-        if(FAILED(hr) || !devices_containerp)
-        {
-            // do not release 'dirty' devices_containerp at this stage, only dx_diag_rootp
-            devices_containerp = NULL;
-            goto LCleanup;
-        }
-
-        // make sure there is something inside
-        hr = devices_containerp->GetNumberOfChildContainers(&dw_device_count);
-        if (FAILED(hr) || dw_device_count == 0)
-        {
-            goto LCleanup;
-        }
-
-        // Get device 0
-        // By default 0 device is the primary one, howhever in case of various hybrid graphics
-        // like itegrated AMD and PCI AMD GPUs system might switch.
-        LL_DEBUGS("AppInit") << "devices_containerp->GetChildContainer" << LL_ENDL;
-        hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
-        if(FAILED(hr) || !device_containerp)
-        {
-            goto LCleanup;
-        }
-
-        DWORD vram = 0;
-
-        WCHAR deviceID[512];
-
-        get_wstring(device_containerp, L"szDeviceID", deviceID, 512);
-        // Example: searches id like 1F06 in pnp string (aka VEN_10DE&DEV_1F06)
-        // doesn't seem to work on some systems since format is unrecognizable
-        // but in such case keyDeviceID works
-        if (SUCCEEDED(GetVideoMemoryViaWMI(deviceID, &vram)))
-        {
-            mVRAM = vram/(1024*1024);
-        }
-        else
-        {
-            get_wstring(device_containerp, L"szKeyDeviceID", deviceID, 512);
-            LL_WARNS() << "szDeviceID" << deviceID << LL_ENDL;
-            // '+9' to avoid ENUM\\PCI\\ prefix
-            // Returns string like Enum\\PCI\\VEN_10DE&DEV_1F06&SUBSYS...
-            // and since GetVideoMemoryViaWMI searches by PNPDeviceID it is sufficient
-            if (SUCCEEDED(GetVideoMemoryViaWMI(deviceID + 9, &vram)))
-            {
-                mVRAM = vram / (1024 * 1024);
-            }
-        }
-
-        if (mVRAM == 0)
-        { // Get the English VRAM string
-          std::string ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
-
-          // We don't need the device any more
-          SAFE_RELEASE(device_containerp);
-
-          // Dump the string as an int into the structure
-          char *stopstring;
-          mVRAM = strtol(ram_str.c_str(), &stopstring, 10);
-          LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;
-        }
-
-        if (vram_only)
-        {
-            ok = true;
-            goto LCleanup;
-        }
-
-
-        /* for now, we ONLY do vram_only the rest of this
-           is commented out, to ensure no-one is tempted
-           to use it
-
-        // Now let's get device and driver information
-        // Get the IDxDiagContainer object called "DxDiag_SystemDevices".
-        // This call may take some time while dxdiag gathers the info.
-        DWORD num_devices = 0;
-        WCHAR wszContainer[256];
-        LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer DxDiag_SystemDevices" << LL_ENDL;
-        hr = dx_diag_rootp->GetChildContainer(L"DxDiag_SystemDevices", &system_device_containerp);
-        if (FAILED(hr))
-        {
-            goto LCleanup;
-        }
-
-        hr = system_device_containerp->GetNumberOfChildContainers(&num_devices);
-        if (FAILED(hr))
-        {
-            goto LCleanup;
-        }
-
-        LL_DEBUGS("AppInit") << "DX9 iterating over devices" << LL_ENDL;
-        S32 device_num = 0;
-        for (device_num = 0; device_num < (S32)num_devices; device_num++)
-        {
-            hr = system_device_containerp->EnumChildContainerNames(device_num, wszContainer, 256);
-            if (FAILED(hr))
-            {
-                goto LCleanup;
-            }
-
-            hr = system_device_containerp->GetChildContainer(wszContainer, &device_containerp);
-            if (FAILED(hr) || device_containerp == NULL)
-            {
-                goto LCleanup;
-            }
-
-            std::string device_name = get_string(device_containerp, L"szDescription");
-
-            std::string device_id = get_string(device_containerp, L"szDeviceID");
-
-            LLDXDevice *dxdevicep = new LLDXDevice;
-            dxdevicep->mName = device_name;
-            dxdevicep->mPCIString = device_id;
-            mDevices[dxdevicep->mPCIString] = dxdevicep;
-
-            // Split the PCI string based on vendor, device, subsys, rev.
-            std::string str(device_id);
-            typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-            boost::char_separator<char> sep("&\\", "", boost::keep_empty_tokens);
-            tokenizer tokens(str, sep);
-
-            tokenizer::iterator iter = tokens.begin();
-            S32 count = 0;
-            bool valid = true;
-            for (;(iter != tokens.end()) && (count < 3);++iter)
-            {
-                switch (count)
-                {
-                case 0:
-                    if (strcmp(iter->c_str(), "PCI"))
-                    {
-                        valid = false;
-                    }
-                    break;
-                case 1:
-                    dxdevicep->mVendorID = iter->c_str();
-                    break;
-                case 2:
-                    dxdevicep->mDeviceID = iter->c_str();
-                    break;
-                default:
-                    // Ignore it
-                    break;
-                }
-                count++;
-            }
-
-
-
-
-            // Now, iterate through the related drivers
-            hr = device_containerp->GetChildContainer(L"Drivers", &driver_containerp);
-            if (FAILED(hr) || !driver_containerp)
-            {
-                goto LCleanup;
-            }
-
-            DWORD num_files = 0;
-            hr = driver_containerp->GetNumberOfChildContainers(&num_files);
-            if (FAILED(hr))
-            {
-                goto LCleanup;
-            }
-
-            S32 file_num = 0;
-            for (file_num = 0; file_num < (S32)num_files; file_num++ )
-            {
-
-                hr = driver_containerp->EnumChildContainerNames(file_num, wszContainer, 256);
-                if (FAILED(hr))
-                {
-                    goto LCleanup;
-                }
-
-                hr = driver_containerp->GetChildContainer(wszContainer, &file_containerp);
-                if (FAILED(hr) || file_containerp == NULL)
-                {
-                    goto LCleanup;
-                }
-
-                std::string driver_path = get_string(file_containerp, L"szPath");
-                std::string driver_name = get_string(file_containerp, L"szName");
-                std::string driver_version = get_string(file_containerp, L"szVersion");
-                std::string driver_date = get_string(file_containerp, L"szDatestampEnglish");
-
-                LLDXDriverFile *dxdriverfilep = new LLDXDriverFile;
-                dxdriverfilep->mName = driver_name;
-                dxdriverfilep->mFilepath= driver_path;
-                dxdriverfilep->mVersionString = driver_version;
-                dxdriverfilep->mVersion.set(driver_version);
-                dxdriverfilep->mDateString = driver_date;
-
-                dxdevicep->mDriverFiles[driver_name] = dxdriverfilep;
-
-                SAFE_RELEASE(file_containerp);
-            }
-            SAFE_RELEASE(device_containerp);
-        }
-        */
-    }
-
-    // dumpDevices();
-    ok = true;
-
-LCleanup:
-    if (!ok)
-    {
-        LL_WARNS("AppInit") << "DX9 probe failed" << LL_ENDL;
-        gWriteDebug("DX9 probe failed\n");
-    }
-
-    SAFE_RELEASE(file_containerp);
-    SAFE_RELEASE(driver_containerp);
-    SAFE_RELEASE(device_containerp);
-    SAFE_RELEASE(devices_containerp);
-    SAFE_RELEASE(dx_diag_rootp);
-    SAFE_RELEASE(dx_diag_providerp);
-
-    CoUninitialize();
-
-    return ok;
-    }
-
 LLSD LLDXHardware::getDisplayInfo()
 {
     LLTimer hw_timer;
@@ -995,7 +349,6 @@ LLSD LLDXHardware::getDisplayInfo()
     if (FAILED(hr))
     {
         LL_WARNS() << "No DXDiag provider found!  DirectX 9 not installed!" << LL_ENDL;
-        gWriteDebug("No DXDiag provider found!  DirectX 9 not installed!\n");
         goto LCleanup;
     }
     if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
@@ -1087,7 +440,7 @@ LLSD LLDXHardware::getDisplayInfo()
                     // print the value
                     // windows doesn't guarantee to be null terminated
                     release_version[RV_SIZE - 1] = NULL;
-                    ret["DriverVersion"] = utf16str_to_utf8str(release_version);
+                    ret["DriverVersion"] = ll_convert<std::string>(std::wstring(release_version));
 
                 }
                 RegCloseKey(hKey);
@@ -1111,9 +464,4 @@ LCleanup:
     return ret;
 }
 
-void LLDXHardware::setWriteDebugFunc(void (*func)(const char*))
-{
-    gWriteDebug = func;
-}
-
 #endif
diff --git a/indra/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h
index 2b879e021c..8d8a08a4eb 100644
--- a/indra/llwindow/lldxhardware.h
+++ b/indra/llwindow/lldxhardware.h
@@ -30,64 +30,16 @@
 #include <map>
 
 #include "stdtypes.h"
-#include "llstring.h"
 #include "llsd.h"
 
-class LLVersion
-{
-public:
-    LLVersion();
-    bool set(const std::string &version_string);
-    S32 getField(const S32 field_num);
-protected:
-    std::string mVersionString;
-    S32 mFields[4];
-    bool mValid;
-};
-
-class LLDXDriverFile
-{
-public:
-    std::string dump();
-
-public:
-    std::string mFilepath;
-    std::string mName;
-    std::string mVersionString;
-    LLVersion mVersion;
-    std::string mDateString;
-};
-
-class LLDXDevice
-{
-public:
-    ~LLDXDevice();
-    std::string dump();
-
-    LLDXDriverFile *findDriver(const std::string &driver);
-public:
-    std::string mName;
-    std::string mPCIString;
-    std::string mVendorID;
-    std::string mDeviceID;
-
-    typedef std::map<std::string, LLDXDriverFile *> driver_file_map_t;
-    driver_file_map_t mDriverFiles;
-};
-
 
 class LLDXHardware
 {
 public:
     LLDXHardware();
 
-    void setWriteDebugFunc(void (*func)(const char*));
     void cleanup();
 
-    // Returns true on success.
-    // vram_only true does a "light" probe.
-    bool getInfo(bool vram_only);
-
     // WMI can return multiple GPU drivers
     // specify which one to output
     typedef enum {
@@ -98,29 +50,9 @@ public:
     } EGPUVendor;
     std::string getDriverVersionWMI(EGPUVendor vendor);
 
-    S32 getVRAM() const { return mVRAM; }
-
     LLSD getDisplayInfo();
-
-    // Will get memory of best GPU in MB, return memory on sucsess, 0 on failure
-    // Note: WMI is not accurate in some cases
-    static U32 getMBVideoMemoryViaWMI();
-
-    // Find a particular device that matches the following specs.
-    // Empty strings indicate that you don't care.
-    // You can separate multiple devices with '|' chars to indicate you want
-    // ANY of them to match and return.
-    // LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
-
-    // std::string dumpDevices();
-public:
-    typedef std::map<std::string, LLDXDevice *> device_map_t;
-    // device_map_t mDevices;
-protected:
-    S32 mVRAM;
 };
 
-extern void (*gWriteDebug)(const char* msg);
 extern LLDXHardware gDXHardware;
 
 #endif // LL_LLDXHARDWARE_H
diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h
index 97f4125484..028549b82e 100644
--- a/indra/llwindow/llopenglview-objc.h
+++ b/indra/llwindow/llopenglview-objc.h
@@ -42,7 +42,6 @@
     unsigned int mMarkedTextLength;
     bool mMarkedTextAllowed;
     bool mSimulatedRightClick;
-    bool mOldResize;
 }
 - (id) initWithSamples:(NSUInteger)samples;
 - (id) initWithSamples:(NSUInteger)samples andVsync:(BOOL)vsync;
@@ -50,8 +49,6 @@
 
 - (void)commitCurrentPreedit;
 
-- (void) setOldResize:(bool)oldresize;
-
 // rebuildContext
 // Destroys and recreates a context with the view's internal format set via setPixelFormat;
 // Use this in event of needing to rebuild a context for whatever reason, without needing to assign a new pixel format.
@@ -68,7 +65,6 @@
 - (unsigned long) getVramSize;
 
 - (void) allowMarkedTextInput:(bool)allowed;
-- (void) viewDidEndLiveResize;
 
 @end
 
@@ -88,9 +84,6 @@
 
 @interface LLNSWindow : NSWindow
 
-- (NSPoint)convertToScreenFromLocalPoint:(NSPoint)point relativeToView:(NSView *)view;
-- (NSPoint)flipPoint:(NSPoint)aPoint;
-
 @end
 
 @interface NSScreen (PointConversion)
@@ -100,16 +93,6 @@
  */
 + (NSScreen *)currentScreenForMouseLocation;
 
-/*
- Allows you to convert a point from global coordinates to the current screen coordinates.
- */
-- (NSPoint)convertPointToScreenCoordinates:(NSPoint)aPoint;
-
-/*
- Allows to flip the point coordinates, so y is 0 at the top instead of the bottom. x remains the same
- */
-- (NSPoint)flipPoint:(NSPoint)aPoint;
-
 @end
 
 #endif
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 0bd4e506a2..403103991e 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -28,6 +28,8 @@
 #import "llwindowmacosx-objc.h"
 #import "llappdelegate-objc.h"
 
+#import <Carbon/Carbon.h>
+
 extern BOOL gHiDPISupport;
 
 #pragma mark local functions
@@ -64,16 +66,16 @@ attributedStringInfo getSegments(NSAttributedString *str)
     segment_standouts seg_standouts;
     NSRange effectiveRange;
     NSRange limitRange = NSMakeRange(0, [str length]);
-    
+
     while (limitRange.length > 0) {
         NSNumber *attr = [str attribute:NSUnderlineStyleAttributeName atIndex:limitRange.location longestEffectiveRange:&effectiveRange inRange:limitRange];
         limitRange = NSMakeRange(NSMaxRange(effectiveRange), NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
-        
+
         if (effectiveRange.length <= 0)
         {
             effectiveRange.length = 1;
         }
-        
+
         if ([attr integerValue] == 2)
         {
             seg_lengths.push_back(effectiveRange.length);
@@ -96,47 +98,23 @@ attributedStringInfo getSegments(NSAttributedString *str)
 + (NSScreen *)currentScreenForMouseLocation
 {
     NSPoint mouseLocation = [NSEvent mouseLocation];
-    
+
     NSEnumerator *screenEnumerator = [[NSScreen screens] objectEnumerator];
     NSScreen *screen;
     while ((screen = [screenEnumerator nextObject]) && !NSMouseInRect(mouseLocation, screen.frame, NO))
         ;
-    
-    return screen;
-}
 
-
-- (NSPoint)convertPointToScreenCoordinates:(NSPoint)aPoint
-{
-    float normalizedX = fabs(fabs(self.frame.origin.x) - fabs(aPoint.x));
-    float normalizedY = aPoint.y - self.frame.origin.y;
-    
-    return NSMakePoint(normalizedX, normalizedY);
-}
-
-- (NSPoint)flipPoint:(NSPoint)aPoint
-{
-    return NSMakePoint(aPoint.x, self.frame.size.height - aPoint.y);
+    return screen;
 }
 
 @end
 
 @implementation LLOpenGLView
 
-// Force a high quality update after live resizing
-- (void) viewDidEndLiveResize
-{
-    if (mOldResize)  //Maint-3135
-    {
-        NSSize size = [self frame].size;
-        callResize(size.width, size.height);
-    }
-}
-
 - (unsigned long)getVramSize
 {
     CGLRendererInfoObj info = 0;
-	GLint vram_megabytes = 0;
+    GLint vram_megabytes = 0;
     int num_renderers = 0;
     CGLError the_err = CGLQueryRendererInfo (CGDisplayIDToOpenGLDisplayMask(kCGDirectMainDisplay), &info, &num_renderers);
     if(0 == the_err)
@@ -153,30 +131,30 @@ attributedStringInfo getSegments(NSAttributedString *str)
     {
         vram_megabytes = 256;
     }
-    
-	return (unsigned long)vram_megabytes; // return value is in megabytes.
+
+    return (unsigned long)vram_megabytes; // return value is in megabytes.
 }
 
 - (void)viewDidMoveToWindow
 {
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(windowResized:) name:NSWindowDidResizeNotification
-											   object:[self window]];
-    
     [[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(windowWillMiniaturize:) name:NSWindowWillMiniaturizeNotification
-											   object:[self window]];
-    
+                                             selector:@selector(windowResized:) name:NSWindowDidResizeNotification
+                                               object:[self window]];
+
     [[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification
-											   object:[self window]];
-    
+                                             selector:@selector(windowWillMiniaturize:) name:NSWindowWillMiniaturizeNotification
+                                               object:[self window]];
+
     [[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification
-											   object:[self window]];
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(windowDidChangeScreen:) name:NSWindowDidChangeScreenNotification
-											   object:[self window]];
+                                             selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification
+                                               object:[self window]];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification
+                                               object:[self window]];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(windowDidChangeScreen:) name:NSWindowDidChangeScreenNotification
+                                               object:[self window]];
 
 
     NSRect wnd_rect = [[self window] frame];
@@ -187,18 +165,10 @@ attributedStringInfo getSegments(NSAttributedString *str)
     }
 }
 
-- (void)setOldResize:(bool)oldresize
-{
-    mOldResize = oldresize;
-}
-
 - (void)windowResized:(NSNotification *)notification;
 {
-    if (!mOldResize)  //Maint-3288
-    {
-        NSSize dev_sz = gHiDPISupport ? [self convertSizeToBacking:[self frame].size] : [self frame].size;
-        callResize(dev_sz.width, dev_sz.height);
-    }
+    NSSize dev_sz = [self convertSizeToBacking:[self frame].size];
+    callResize(dev_sz.width, dev_sz.height);
 }
 
 - (void)windowWillMiniaturize:(NSNotification *)notification;
@@ -218,131 +188,139 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 -(void)windowDidChangeScreen:(NSNotification *)notification;
 {
-	callWindowDidChangeScreen();
+    callWindowDidChangeScreen();
 }
 
 - (void)dealloc
 {
-	[[NSNotificationCenter defaultCenter] removeObserver:self];
-	[super dealloc];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
 }
 
 - (id) init
 {
-	return [self initWithFrame:[self bounds] withSamples:2 andVsync:TRUE];
+    return [self initWithFrame:[self bounds] withSamples:2 andVsync:TRUE];
 }
 
 - (id) initWithSamples:(NSUInteger)samples
 {
-	return [self initWithFrame:[self bounds] withSamples:samples andVsync:TRUE];
+    return [self initWithFrame:[self bounds] withSamples:samples andVsync:TRUE];
 }
 
 - (id) initWithSamples:(NSUInteger)samples andVsync:(BOOL)vsync
 {
-	return [self initWithFrame:[self bounds] withSamples:samples andVsync:vsync];
+    return [self initWithFrame:[self bounds] withSamples:samples andVsync:vsync];
 }
 
+#if LL_DARWIN
+// For setView and opengl deprecation
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 - (id) initWithFrame:(NSRect)frame withSamples:(NSUInteger)samples andVsync:(BOOL)vsync
 {
-	[self registerForDraggedTypes:[NSArray arrayWithObject:NSURLPboardType]];
-	[self initWithFrame:frame];
-	
-	// Initialize with a default "safe" pixel format that will work with versions dating back to OS X 10.6.
-	// Any specialized pixel formats, i.e. a core profile pixel format, should be initialized through rebuildContextWithFormat.
-	// 10.7 and 10.8 don't really care if we're defining a profile or not.  If we don't explicitly request a core or legacy profile, it'll always assume a legacy profile (for compatibility reasons).
-	NSOpenGLPixelFormatAttribute attrs[] = {
+    [self registerForDraggedTypes:[NSArray arrayWithObject:NSPasteboardTypeURL]];
+    [self initWithFrame:frame];
+
+    // Initialize with a default "safe" pixel format that will work with versions dating back to OS X 10.6.
+    // Any specialized pixel formats, i.e. a core profile pixel format, should be initialized through rebuildContextWithFormat.
+    // 10.7 and 10.8 don't really care if we're defining a profile or not.  If we don't explicitly request a core or legacy profile, it'll always assume a legacy profile (for compatibility reasons).
+    NSOpenGLPixelFormatAttribute attrs[] = {
         NSOpenGLPFANoRecovery,
-		NSOpenGLPFADoubleBuffer,
-		NSOpenGLPFAClosestPolicy,
-		NSOpenGLPFAAccelerated,
-		NSOpenGLPFASampleBuffers, static_cast<NSOpenGLPixelFormatAttribute>(samples > 0 ? 1 : 0),
-		NSOpenGLPFASamples, static_cast<NSOpenGLPixelFormatAttribute>(samples),
-		NSOpenGLPFAStencilSize, 8,
-		NSOpenGLPFADepthSize, 24,
-		NSOpenGLPFAAlphaSize, 8,
-		NSOpenGLPFAColorSize, 24,
-		NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion4_1Core,
-		0
+        NSOpenGLPFADoubleBuffer,
+        NSOpenGLPFAClosestPolicy,
+        NSOpenGLPFAAccelerated,
+        NSOpenGLPFASampleBuffers, 0,
+        NSOpenGLPFASamples, 0,
+        NSOpenGLPFAStencilSize, 8,
+        NSOpenGLPFADepthSize, 24,
+        NSOpenGLPFAAlphaSize, 8,
+        NSOpenGLPFAColorSize, 24,
+        NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion4_1Core,
+        0
     };
-	
-	NSOpenGLPixelFormat *pixelFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs] autorelease];
-	
-	if (pixelFormat == nil)
-	{
-		NSLog(@"Failed to create pixel format!", nil);
-		return nil;
-	}
-	
-	NSOpenGLContext *glContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil];
-	
-	if (glContext == nil)
-	{
-		NSLog(@"Failed to create OpenGL context!", nil);
-		return nil;
-	}
-	
-	[self setPixelFormat:pixelFormat];
 
-	//for retina support
-	[self setWantsBestResolutionOpenGLSurface:gHiDPISupport];
+    NSOpenGLPixelFormat *pixelFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs] autorelease];
+
+    if (pixelFormat == nil)
+    {
+        NSLog(@"Failed to create pixel format!", nil);
+        return nil;
+    }
+
+    NSOpenGLContext *glContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil];
+
+    if (glContext == nil)
+    {
+        NSLog(@"Failed to create OpenGL context!", nil);
+        return nil;
+    }
+
+    [self setPixelFormat:pixelFormat];
+
+    //for retina support
+    [self setWantsBestResolutionOpenGLSurface:gHiDPISupport];
+
+    [self setOpenGLContext:glContext];
 
-	[self setOpenGLContext:glContext];
-	
-	[glContext setView:self];
-	
-	[glContext makeCurrentContext];
-	
-	if (vsync)
-	{
-		GLint value = 1;
-		[glContext setValues:&value forParameter:NSOpenGLCPSwapInterval];
-	} else {
-		// supress this error after move to Xcode 7:
-		// error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull]
-		// Tried using ObjC 'nonnull' keyword as per SO article but didn't build
-		GLint swapInterval=0;
-		[glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
-	}
-	
-    mOldResize = false;
-    
-	return self;
+    [glContext setView:self];
+
+    [glContext makeCurrentContext];
+
+    if (vsync)
+    {
+        GLint value = 1;
+        [glContext setValues:&value forParameter:NSOpenGLContextParameterSwapInterval];
+    } else {
+        // supress this error after move to Xcode 7:
+        // error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull]
+        // Tried using ObjC 'nonnull' keyword as per SO article but didn't build
+        GLint swapInterval=0;
+        [glContext setValues:&swapInterval forParameter:NSOpenGLContextParameterSwapInterval];
+    }
+
+    return self;
 }
 
 - (BOOL) rebuildContext
 {
-	return [self rebuildContextWithFormat:[self pixelFormat]];
+    return [self rebuildContextWithFormat:[self pixelFormat]];
 }
 
 - (BOOL) rebuildContextWithFormat:(NSOpenGLPixelFormat *)format
 {
-	NSOpenGLContext *ctx = [self openGLContext];
-	
-	[ctx clearDrawable];
-	[ctx initWithFormat:format shareContext:nil];
-	
-	if (ctx == nil)
-	{
-		NSLog(@"Failed to create OpenGL context!", nil);
-		return false;
-	}
-	
-	[self setOpenGLContext:ctx];
-	[ctx setView:self];
-	[ctx makeCurrentContext];
-	return true;
+    NSOpenGLContext *ctx = [self openGLContext];
+
+    [ctx clearDrawable];
+    [ctx initWithFormat:format shareContext:nil];
+
+    if (ctx == nil)
+    {
+        NSLog(@"Failed to create OpenGL context!", nil);
+        return false;
+    }
+
+    [self setOpenGLContext:ctx];
+    [ctx setView:self];
+    [ctx makeCurrentContext];
+    return true;
 }
 
+#if LL_DARWIN
+#pragma clang diagnostic pop
+#endif
+
 - (CGLContextObj)getCGLContextObj
 {
-	NSOpenGLContext *ctx = [self openGLContext];
-	return (CGLContextObj)[ctx CGLContextObj];
+    NSOpenGLContext *ctx = [self openGLContext];
+    return (CGLContextObj)[ctx CGLContextObj];
 }
 
 - (CGLPixelFormatObj*)getCGLPixelFormatObj
 {
-	NSOpenGLPixelFormat *fmt = [self pixelFormat];
-	return (CGLPixelFormatObj*)[fmt	CGLPixelFormatObj];
+    NSOpenGLPixelFormat *fmt = [self pixelFormat];
+    return (CGLPixelFormatObj*)[fmt CGLPixelFormatObj];
 }
 
 // Various events can be intercepted by our view, thus not reaching our window.
@@ -350,18 +328,14 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void) mouseDown:(NSEvent *)theEvent
 {
-    NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-    mMousePos[0] = mPoint.x;
-    mMousePos[1] = mPoint.y;
-
     // Apparently people still use this?
-    if ([theEvent modifierFlags] & NSCommandKeyMask &&
-        !([theEvent modifierFlags] & NSControlKeyMask) &&
-        !([theEvent modifierFlags] & NSShiftKeyMask) &&
-        !([theEvent modifierFlags] & NSAlternateKeyMask) &&
-        !([theEvent modifierFlags] & NSAlphaShiftKeyMask) &&
-        !([theEvent modifierFlags] & NSFunctionKeyMask) &&
-        !([theEvent modifierFlags] & NSHelpKeyMask))
+    if ([theEvent modifierFlags] & NSEventModifierFlagCommand &&
+        !([theEvent modifierFlags] & NSEventModifierFlagControl) &&
+        !([theEvent modifierFlags] & NSEventModifierFlagShift) &&
+        !([theEvent modifierFlags] & NSEventModifierFlagOption) &&
+        !([theEvent modifierFlags] & NSEventModifierFlagCapsLock) &&
+        !([theEvent modifierFlags] & NSEventModifierFlagFunction) &&
+        !([theEvent modifierFlags] & NSEventModifierFlagHelp))
     {
         callRightMouseDown(mMousePos, [theEvent modifierFlags]);
         mSimulatedRightClick = true;
@@ -382,7 +356,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
         callRightMouseUp(mMousePos, [theEvent modifierFlags]);
         mSimulatedRightClick = false;
     } else {
-        NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
+        NSPoint mPoint = [self convertPointToBacking:[theEvent locationInWindow]];
         mMousePos[0] = mPoint.x;
         mMousePos[1] = mPoint.y;
         callLeftMouseUp(mMousePos, [theEvent modifierFlags]);
@@ -391,35 +365,29 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void) rightMouseDown:(NSEvent *)theEvent
 {
-    NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-    mMousePos[0] = mPoint.x;
-    mMousePos[1] = mPoint.y;
-	callRightMouseDown(mMousePos, [theEvent modifierFlags]);
+    callRightMouseDown(mMousePos, [theEvent modifierFlags]);
 }
 
 - (void) rightMouseUp:(NSEvent *)theEvent
 {
-    NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-    mMousePos[0] = mPoint.x;
-    mMousePos[1] = mPoint.y;
-	callRightMouseUp(mMousePos, [theEvent modifierFlags]);
+    callRightMouseUp(mMousePos, [theEvent modifierFlags]);
 }
 
 - (void)mouseMoved:(NSEvent *)theEvent
 {
-    NSPoint dev_delta = gHiDPISupport ? [self convertPointToBacking:NSMakePoint([theEvent deltaX], [theEvent deltaY])] : NSMakePoint([theEvent deltaX], [theEvent deltaY]);
+    NSPoint dev_delta = [self convertPointToBacking:NSMakePoint([theEvent deltaX], [theEvent deltaY])];
+
+    float mouseDeltas[] = {
+        float(dev_delta.x),
+        float(dev_delta.y)
+    };
+
+    callDeltaUpdate(mouseDeltas, 0);
 
-	float mouseDeltas[] = {
-		float(dev_delta.x),
-		float(dev_delta.y)
-	};
-	
-	callDeltaUpdate(mouseDeltas, 0);
-	
-    NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-	mMousePos[0] = mPoint.x;
-	mMousePos[1] = mPoint.y;
-	callMouseMoved(mMousePos, 0);
+    NSPoint mPoint = [self convertPointToBacking:[theEvent locationInWindow]];
+    mMousePos[0] = mPoint.x;
+    mMousePos[1] = mPoint.y;
+    callMouseMoved(mMousePos, 0);
 }
 
 // NSWindow doesn't trigger mouseMoved when the mouse is being clicked and dragged.
@@ -427,80 +395,74 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void) mouseDragged:(NSEvent *)theEvent
 {
-	// Trust the deltas supplied by NSEvent.
-	// The old CoreGraphics APIs we previously relied on are now flagged as obsolete.
-	// NSEvent isn't obsolete, and provides us with the correct deltas.
+    // Trust the deltas supplied by NSEvent.
+    // The old CoreGraphics APIs we previously relied on are now flagged as obsolete.
+    // NSEvent isn't obsolete, and provides us with the correct deltas.
+
+    NSPoint dev_delta = [self convertPointToBacking:NSMakePoint([theEvent deltaX], [theEvent deltaY])];
+
+    float mouseDeltas[] = {
+        float(dev_delta.x),
+        float(dev_delta.y)
+    };
 
-    NSPoint dev_delta = gHiDPISupport ? [self convertPointToBacking:NSMakePoint([theEvent deltaX], [theEvent deltaY])] : NSMakePoint([theEvent deltaX], [theEvent deltaY]);
+    callDeltaUpdate(mouseDeltas, 0);
 
-	float mouseDeltas[] = {
-		float(dev_delta.x),
-		float(dev_delta.y)
-	};
-	
-	callDeltaUpdate(mouseDeltas, 0);
-	
-	NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-	mMousePos[0] = mPoint.x;
-	mMousePos[1] = mPoint.y;
-	callMouseDragged(mMousePos, 0);
+    NSPoint mPoint = [self convertPointToBacking:[theEvent locationInWindow]];
+    mMousePos[0] = mPoint.x;
+    mMousePos[1] = mPoint.y;
+    callMouseDragged(mMousePos, 0);
 }
 
 - (void) otherMouseDown:(NSEvent *)theEvent
 {
-    NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-    mMousePos[0] = mPoint.x;
-    mMousePos[1] = mPoint.y;
     callOtherMouseDown(mMousePos, [theEvent modifierFlags], [theEvent buttonNumber]);
 }
 
 - (void) otherMouseUp:(NSEvent *)theEvent
 {
-    NSPoint mPoint = gHiDPISupport ? [self convertPointToBacking:[theEvent locationInWindow]] : [theEvent locationInWindow];
-    mMousePos[0] = mPoint.x;
-    mMousePos[1] = mPoint.y;
     callOtherMouseUp(mMousePos, [theEvent modifierFlags], [theEvent buttonNumber]);
 }
 
 - (void) rightMouseDragged:(NSEvent *)theEvent
 {
-	[self mouseDragged:theEvent];
+    [self mouseDragged:theEvent];
 }
 
 - (void) otherMouseDragged:(NSEvent *)theEvent
 {
-	[self mouseDragged:theEvent];        
+    [self mouseDragged:theEvent];
 }
 
 - (void) scrollWheel:(NSEvent *)theEvent
 {
-	callScrollMoved(-[theEvent deltaX], -[theEvent deltaY]);
+    callScrollMoved(-[theEvent deltaX], -[theEvent deltaY]);
 }
 
 - (void) mouseExited:(NSEvent *)theEvent
 {
-	callMouseExit();
+    callMouseExit();
 }
 
 - (void) keyUp:(NSEvent *)theEvent
 {
     NativeKeyEventData eventData = extractKeyDataFromKeyEvent(theEvent);
     eventData.mKeyEvent = NativeKeyEventData::KEYUP;
-	callKeyUp(&eventData, [theEvent keyCode], [theEvent modifierFlags]);
+    callKeyUp(&eventData, [theEvent keyCode], [theEvent modifierFlags]);
 }
 
 - (void) keyDown:(NSEvent *)theEvent
 {
     NativeKeyEventData eventData = extractKeyDataFromKeyEvent(theEvent);
     eventData.mKeyEvent = NativeKeyEventData::KEYDOWN;
-   
+
     uint keycode = [theEvent keyCode];
     // We must not depend on flagsChange event to detect modifier flags changed,
     // must depend on the modifire flags in the event parameter.
     // Because flagsChange event handler misses event when other window is activated,
     // e.g. OS Window for upload something or Input Window...
     // mModifiers instance variable is for insertText: or insertText:replacementRange:  (by Pell Smit)
-	mModifiers = [theEvent modifierFlags];
+    mModifiers = [theEvent modifierFlags];
     NSString *str_no_modifiers = [theEvent charactersIgnoringModifiers];
     unichar ch = 0;
     if (str_no_modifiers.length)
@@ -511,7 +473,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
     if (acceptsText &&
         !mMarkedTextAllowed &&
-        !(mModifiers & (NSControlKeyMask | NSCommandKeyMask)) &&  // commands don't invoke InputWindow
+        !(mModifiers & (NSEventModifierFlagControl | NSEventModifierFlagCommand)) &&  // commands don't invoke InputWindow
         ![(LLAppDelegate*)[NSApp delegate] romanScript] &&
         ch > ' ' &&
         ch != NSDeleteCharacter &&
@@ -527,26 +489,26 @@ attributedStringInfo getSegments(NSAttributedString *str)
 - (void)flagsChanged:(NSEvent *)theEvent
 {
     NativeKeyEventData eventData = extractKeyDataFromModifierEvent(theEvent);
- 
-	mModifiers = [theEvent modifierFlags];
-	callModifier([theEvent modifierFlags]);
-     
+
+    mModifiers = [theEvent modifierFlags];
+    callModifier([theEvent modifierFlags]);
+
     NSInteger mask = 0;
     switch([theEvent keyCode])
-    {        
-        case 56:
-            mask = NSShiftKeyMask;
+    {
+        case kVK_Shift:
+            mask = NSEventModifierFlagShift;
             break;
-        case 58:
-            mask = NSAlternateKeyMask;
+        case kVK_Option:
+            mask = NSEventModifierFlagOption;
             break;
-        case 59:
-            mask = NSControlKeyMask;
+        case kVK_Control:
+            mask = NSEventModifierFlagControl;
             break;
         default:
-            return;            
+            return;
     }
-    
+
     if (mModifiers & mask)
     {
         eventData.mKeyEvent = NativeKeyEventData::KEYDOWN;
@@ -565,74 +527,74 @@ attributedStringInfo getSegments(NSAttributedString *str)
     {
         eventData.mKeyEvent = NativeKeyEventData::KEYUP;
         callKeyUp(&eventData, [theEvent keyCode], 0);
-    }  
+    }
 }
 
 - (BOOL) acceptsFirstResponder
 {
-	return YES;
+    return YES;
 }
 
 - (NSDragOperation) draggingEntered:(id<NSDraggingInfo>)sender
 {
-	NSPasteboard *pboard;
+    NSPasteboard *pboard;
     NSDragOperation sourceDragMask;
-	
-	sourceDragMask = [sender draggingSourceOperationMask];
-	
-	pboard = [sender draggingPasteboard];
-	
-	if ([[pboard types] containsObject:NSURLPboardType])
-	{
-		if (sourceDragMask & NSDragOperationLink) {
-			NSURL *fileUrl = [[pboard readObjectsForClasses:[NSArray arrayWithObject:[NSURL class]] options:[NSDictionary dictionary]] objectAtIndex:0];
-			mLastDraggedUrl = [[fileUrl absoluteString] UTF8String];
+
+    sourceDragMask = [sender draggingSourceOperationMask];
+
+    pboard = [sender draggingPasteboard];
+
+    if ([[pboard types] containsObject:NSPasteboardTypeURL])
+    {
+        if (sourceDragMask & NSDragOperationLink) {
+            NSURL *fileUrl = [[pboard readObjectsForClasses:[NSArray arrayWithObject:[NSURL class]] options:[NSDictionary dictionary]] objectAtIndex:0];
+            mLastDraggedUrl = [[fileUrl absoluteString] UTF8String];
             return NSDragOperationLink;
         }
-	}
-	return NSDragOperationNone;
+    }
+    return NSDragOperationNone;
 }
 
 - (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
 {
-	callHandleDragUpdated(mLastDraggedUrl);
-	
-	return NSDragOperationLink;
+    callHandleDragUpdated(mLastDraggedUrl);
+
+    return NSDragOperationLink;
 }
 
 - (void) draggingExited:(id<NSDraggingInfo>)sender
 {
-	callHandleDragExited(mLastDraggedUrl);
+    callHandleDragExited(mLastDraggedUrl);
 }
 
 - (BOOL)prepareForDragOperation:(id < NSDraggingInfo >)sender
 {
-	return YES;
+    return YES;
 }
 
 - (BOOL) performDragOperation:(id<NSDraggingInfo>)sender
 {
-	callHandleDragDropped(mLastDraggedUrl);
-	return true;
+    callHandleDragDropped(mLastDraggedUrl);
+    return true;
 }
 
 - (BOOL)hasMarkedText
 {
-	return mHasMarkedText;
+    return mHasMarkedText;
 }
 
 - (NSRange)markedRange
 {
-	int range[2];
-	getPreeditMarkedRange(&range[0], &range[1]);
-	return NSMakeRange(range[0], range[1]);
+    int range[2];
+    getPreeditMarkedRange(&range[0], &range[1]);
+    return NSMakeRange(range[0], range[1]);
 }
 
 - (NSRange)selectedRange
 {
-	int range[2];
-	getPreeditSelectionRange(&range[0], &range[1]);
-	return NSMakeRange(range[0], range[1]);
+    int range[2];
+    getPreeditSelectionRange(&range[0], &range[1]);
+    return NSMakeRange(range[0], range[1]);
 }
 
 - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
@@ -650,14 +612,14 @@ attributedStringInfo getSegments(NSAttributedString *str)
             unsigned(selectedRange.location),
             unsigned(selectedRange.length)
         };
-        
+
         unsigned int replacement[2] = {
             unsigned(replacementRange.location),
             unsigned(replacementRange.length)
         };
-        
+
         int string_length = [aString length];
-        unichar text[string_length];
+        unichar *text = new unichar[string_length];
         attributedStringInfo segments;
         // I used 'respondsToSelector:@selector(string)'
         // to judge aString is an attributed string or not.
@@ -685,6 +647,8 @@ attributedStringInfo getSegments(NSAttributedString *str)
             // we must clear the marked text when aString is null.
             [self unmarkText];
         }
+
+        delete [] text;
     } else {
         if (mHasMarkedText)
         {
@@ -693,6 +657,12 @@ attributedStringInfo getSegments(NSAttributedString *str)
     }
 }
 
+#if LL_DARWIN
+// For commitEditing deprecation
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 - (void)commitCurrentPreedit
 {
     if (mHasMarkedText)
@@ -704,23 +674,27 @@ attributedStringInfo getSegments(NSAttributedString *str)
     }
 }
 
+#if LL_DARWIN
+#pragma clang diagnostic pop
+#endif
+
 - (void)unmarkText
 {
-	[[self inputContext] discardMarkedText];
-	resetPreedit();
-	mHasMarkedText = FALSE;
+    [[self inputContext] discardMarkedText];
+    resetPreedit();
+    mHasMarkedText = FALSE;
 }
 
 // We don't support attributed strings.
 - (NSArray *)validAttributesForMarkedText
 {
-	return [NSArray array];
+    return [NSArray array];
 }
 
 // See above.
 - (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
 {
-	return nil;
+    return nil;
 }
 
 - (void)insertText:(id)insertString
@@ -733,9 +707,9 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
 {
-	// SL-19801 Special workaround for system emoji picker
-	if ([aString length] == 2)
-	{
+    // SL-19801 Special workaround for system emoji picker
+    if ([aString length] == 2)
+    {
         @try
         {
             uint32_t b0 = [aString characterAtIndex:0];
@@ -753,8 +727,8 @@ attributedStringInfo getSegments(NSAttributedString *str)
             NSLog(@"Encountered an unsupported attributed character. Exception: %@ String: %@", e.name, aString);
             return;
         }
-	}
-    
+    }
+
     @try
     {
         if (!mHasMarkedText)
@@ -767,7 +741,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
             resetPreedit();
             // We may never get this point since unmarkText may be called before insertText ever gets called once we submit our text.
             // But just in case...
-            
+
             for (NSInteger i = 0; i < [aString length]; i++)
             {
                 handleUnicodeCharacter([aString characterAtIndex:i]);
@@ -783,39 +757,39 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void) insertNewline:(id)sender
 {
-	if (!(mModifiers & NSCommandKeyMask) &&
-		!(mModifiers & NSShiftKeyMask) &&
-		!(mModifiers & NSAlternateKeyMask))
-	{
-		callUnicodeCallback(13, 0);
-	} else {
-		callUnicodeCallback(13, mModifiers);
-	}
+    if (!(mModifiers & NSEventModifierFlagCommand) &&
+        !(mModifiers & NSEventModifierFlagShift) &&
+        !(mModifiers & NSEventModifierFlagOption))
+    {
+        callUnicodeCallback(13, 0);
+    } else {
+        callUnicodeCallback(13, mModifiers);
+    }
 }
 
 - (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
 {
-	return NSNotFound;
+    return NSNotFound;
 }
 
 - (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
 {
-	float pos[4] = {0, 0, 0, 0};
-	getPreeditLocation(pos, mMarkedTextLength);
-	return NSMakeRect(pos[0], pos[1], pos[2], pos[3]);
+    float pos[4] = {0, 0, 0, 0};
+    getPreeditLocation(pos, mMarkedTextLength);
+    return NSMakeRect(pos[0], pos[1], pos[2], pos[3]);
 }
 
 - (void)doCommandBySelector:(SEL)aSelector
 {
-	if (aSelector == @selector(insertNewline:))
-	{
-		[self insertNewline:self];
-	}
+    if (aSelector == @selector(insertNewline:))
+    {
+        [self insertNewline:self];
+    }
 }
 
 - (BOOL)drawsVerticallyForCharacterAtIndex:(NSUInteger)charIndex
 {
-	return NO;
+    return NO;
 }
 
 - (void) allowMarkedTextInput:(bool)allowed
@@ -850,7 +824,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void) setGLView:(LLOpenGLView *)view
 {
-	glview = view;
+    glview = view;
 }
 
 - (void)keyDown:(NSEvent *)theEvent
@@ -901,45 +875,24 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (id) init
 {
-	return self;
-}
-
-- (NSPoint)convertToScreenFromLocalPoint:(NSPoint)point relativeToView:(NSView *)view
-{
-	NSScreen *currentScreen = [NSScreen currentScreenForMouseLocation];
-	if(currentScreen)
-	{
-		NSPoint windowPoint = [view convertPoint:point toView:nil];
-		NSPoint screenPoint = [[view window] convertBaseToScreen:windowPoint];
-		NSPoint flippedScreenPoint = [currentScreen flipPoint:screenPoint];
-		flippedScreenPoint.y += [currentScreen frame].origin.y;
-		
-		return flippedScreenPoint;
-	}
-	
-	return NSZeroPoint;
-}
-
-- (NSPoint)flipPoint:(NSPoint)aPoint
-{
-    return NSMakePoint(aPoint.x, self.frame.size.height - aPoint.y);
+    return self;
 }
 
 - (BOOL) becomeFirstResponder
 {
-	callFocus();
-	return true;
+    callFocus();
+    return true;
 }
 
 - (BOOL) resignFirstResponder
 {
-	callFocusLost();
-	return true;
+    callFocusLost();
+    return true;
 }
 
 - (void) close
 {
-	callQuitHandler();
+    callQuitHandler();
 }
 
 @end
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 378e633cd2..eb11a28360 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -103,7 +103,6 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, bool fullscreen, U32 flags)
       mFullscreen(fullscreen),
       mFullscreenWidth(0),
       mFullscreenHeight(0),
-      mFullscreenBits(0),
       mFullscreenRefresh(0),
       mSupportedResolutions(NULL),
       mNumSupportedResolutions(0),
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 5e06e665f3..7a5404e615 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -95,6 +95,7 @@ public:
 #if LL_WINDOWS
     virtual bool getCursorDelta(LLCoordCommon* delta) = 0;
 #endif
+    virtual bool isWrapMouse() const = 0;
     virtual void showCursor() = 0;
     virtual void hideCursor() = 0;
     virtual bool isCursorHidden() = 0;
@@ -147,7 +148,6 @@ public:
     virtual void swapBuffers() = 0;
     virtual void bringToFront() = 0;
     virtual void focusClient() { };     // this may not have meaning or be required on other platforms, therefore, it's not abstract
-    virtual void setOldResize(bool oldresize) { };
     // handy coordinate space conversion routines
     // NB: screen to window and vice verse won't work on width/height coordinate pairs,
     // as the conversion must take into account left AND right border widths, etc.
@@ -223,7 +223,6 @@ protected:
     bool        mFullscreen;
     S32         mFullscreenWidth;
     S32         mFullscreenHeight;
-    S32         mFullscreenBits;
     S32         mFullscreenRefresh;
     LLWindowResolution* mSupportedResolutions;
     S32         mNumSupportedResolutions;
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
index 195f68e08b..7331f50ba0 100644
--- a/indra/llwindow/llwindowcallbacks.cpp
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -68,7 +68,13 @@ void LLWindowCallbacks::handleMouseLeave(LLWindow *window)
     return;
 }
 
-bool LLWindowCallbacks::handleCloseRequest(LLWindow *window)
+bool LLWindowCallbacks::handleCloseRequest(LLWindow *window, bool from_user)
+{
+    //allow the window to close
+    return true;
+}
+
+bool LLWindowCallbacks::handleSessionExit(LLWindow* window)
 {
     //allow the window to close
     return true;
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h
index d812f93524..59dcdd3ade 100644
--- a/indra/llwindow/llwindowcallbacks.h
+++ b/indra/llwindow/llwindowcallbacks.h
@@ -42,7 +42,8 @@ public:
     virtual bool handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
     virtual void handleMouseLeave(LLWindow *window);
     // return true to allow window to close, which will then cause handleQuit to be called
-    virtual bool handleCloseRequest(LLWindow *window);
+    virtual bool handleCloseRequest(LLWindow *window, bool from_user);
+    virtual bool handleSessionExit(LLWindow* window);
     // window is about to be destroyed, clean up your business
     virtual void handleQuit(LLWindow *window);
     virtual bool handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
index 5696b69a59..dc7b833013 100644
--- a/indra/llwindow/llwindowheadless.h
+++ b/indra/llwindow/llwindowheadless.h
@@ -63,6 +63,7 @@ public:
 #if LL_WINDOWS
     /*virtual*/ bool getCursorDelta(LLCoordCommon* delta) override { return false; }
 #endif
+    /*virtual*/ bool isWrapMouse() const override { return true; }
     /*virtual*/ void showCursor() override {}
     /*virtual*/ void hideCursor() override {}
     /*virtual*/ void showCursorFromMouseMove() override {}
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index d9d8bfce1f..b302a705da 100644
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -100,7 +100,6 @@ bool isCGCursorVisible();
 void hideNSCursorTillMove(bool hide);
 void requestUserAttention();
 long showAlert(std::string title, std::string text, int type);
-void setResizeMode(bool oldresize, void* glview);
 
 NSWindowRef createNSWindow(int x, int y, int width, int height);
 
@@ -111,16 +110,14 @@ void glSwapBuffers(void* context);
 CGLContextObj getCGLContextObj(GLViewRef view);
 unsigned long getVramSize(GLViewRef view);
 float getDeviceUnitSize(GLViewRef view);
-CGPoint getContentViewBoundsPosition(NSWindowRef window);
-CGSize getContentViewBoundsSize(NSWindowRef window);
-CGSize getDeviceContentViewSize(NSWindowRef window, GLViewRef view);
+CGRect getContentViewRect(NSWindowRef window);
+CGRect getBackingViewRect(NSWindowRef window, GLViewRef view);
 void getWindowSize(NSWindowRef window, float* size);
 void setWindowSize(NSWindowRef window, int width, int height);
 void getCursorPos(NSWindowRef window, float* pos);
 void makeWindowOrderFront(NSWindowRef window);
 void convertScreenToWindow(NSWindowRef window, float *coord);
 void convertWindowToScreen(NSWindowRef window, float *coord);
-void convertScreenToView(NSWindowRef window, float *coord);
 void convertRectToScreen(NSWindowRef window, float *coord);
 void convertRectFromScreen(NSWindowRef window, float *coord);
 void setWindowPos(NSWindowRef window, float* pos);
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 2e75d309ea..d902a82a3c 100644
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -41,15 +41,15 @@
 
 int createNSApp(int argc, const char *argv[])
 {
-	return NSApplicationMain(argc, argv);
+    return NSApplicationMain(argc, argv);
 }
 
 void setupCocoa()
 {
-	static bool inited = false;
-	
-	if(!inited)
-	{
+    static bool inited = false;
+
+    if(!inited)
+    {
         @autoreleasepool {
             // The following prevents the Cocoa command line parser from trying to open 'unknown' arguements as documents.
             // ie. running './secondlife -set Language fr' would cause a pop-up saying can't open document 'fr'
@@ -57,8 +57,8 @@ void setupCocoa()
             [[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
         }
 
-		inited = true;
-	}
+        inited = true;
+    }
 }
 
 bool copyToPBoard(const unsigned short *str, unsigned int len)
@@ -66,7 +66,7 @@ bool copyToPBoard(const unsigned short *str, unsigned int len)
     @autoreleasepool {
         NSPasteboard *pboard = [NSPasteboard generalPasteboard];
         [pboard clearContents];
-        
+
         NSArray *contentsToPaste = [[[NSArray alloc] initWithObjects:[NSString stringWithCharacters:str length:len], nil] autorelease];
         return [pboard writeObjects:contentsToPaste];
     }
@@ -74,8 +74,8 @@ bool copyToPBoard(const unsigned short *str, unsigned int len)
 
 bool pasteBoardAvailable()
 {
-	NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
-	return [[NSPasteboard generalPasteboard] canReadObjectForClasses:classArray options:[NSDictionary dictionary]];
+    NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
+    return [[NSPasteboard generalPasteboard] canReadObjectForClasses:classArray options:[NSDictionary dictionary]];
 }
 
 unsigned short *copyFromPBoard()
@@ -111,100 +111,110 @@ CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY)
           hotSpot:NSMakePoint(hotspotX, hotspotY)
          ] retain];
     }
-	
-	return (CursorRef)cursor;
+
+    return (CursorRef)cursor;
 }
 
 void setArrowCursor()
 {
-	NSCursor *cursor = [NSCursor arrowCursor];
-	[NSCursor unhide];
-	[cursor set];
+    NSCursor *cursor = [NSCursor arrowCursor];
+    [NSCursor unhide];
+    [cursor set];
 }
 
 void setIBeamCursor()
 {
-	NSCursor *cursor = [NSCursor IBeamCursor];
-	[cursor set];
+    NSCursor *cursor = [NSCursor IBeamCursor];
+    [cursor set];
 }
 
 void setPointingHandCursor()
 {
-	NSCursor *cursor = [NSCursor pointingHandCursor];
-	[cursor set];
+    NSCursor *cursor = [NSCursor pointingHandCursor];
+    [cursor set];
 }
 
 void setCopyCursor()
 {
-	NSCursor *cursor = [NSCursor dragCopyCursor];
-	[cursor set];
+    NSCursor *cursor = [NSCursor dragCopyCursor];
+    [cursor set];
 }
 
 void setCrossCursor()
 {
-	NSCursor *cursor = [NSCursor crosshairCursor];
-	[cursor set];
+    NSCursor *cursor = [NSCursor crosshairCursor];
+    [cursor set];
 }
 
 void setNotAllowedCursor()
 {
-	NSCursor *cursor = [NSCursor operationNotAllowedCursor];
-	[cursor set];
+    NSCursor *cursor = [NSCursor operationNotAllowedCursor];
+    [cursor set];
 }
 
 void hideNSCursor()
 {
-	[NSCursor hide];
+    [NSCursor hide];
 }
 
 void showNSCursor()
 {
-	[NSCursor unhide];
+    [NSCursor unhide];
 }
 
+#if LL_DARWIN
+// For CGCursorIsVisible no replacement in modern API
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 bool isCGCursorVisible()
 {
     return CGCursorIsVisible();
 }
 
+#if LL_DARWIN
+#pragma clang diagnostic pop
+#endif
+
 void hideNSCursorTillMove(bool hide)
 {
-	[NSCursor setHiddenUntilMouseMoves:hide];
+    [NSCursor setHiddenUntilMouseMoves:hide];
 }
 
 // This is currently unused, since we want all our cursors to persist for the life of the app, but I've included it for completeness.
 OSErr releaseImageCursor(CursorRef ref)
 {
-	if( ref != NULL )
-	{
+    if( ref != NULL )
+    {
         @autoreleasepool {
             NSCursor *cursor = (NSCursor*)ref;
             [cursor autorelease];
         }
-	}
-	else
-	{
-		return paramErr;
-	}
-	
-	return noErr;
+    }
+    else
+    {
+        return paramErr;
+    }
+
+    return noErr;
 }
 
 OSErr setImageCursor(CursorRef ref)
 {
-	if( ref != NULL )
-	{
+    if( ref != NULL )
+    {
         @autoreleasepool {
             NSCursor *cursor = (NSCursor*)ref;
             [cursor set];
         }
-	}
-	else
-	{
-		return paramErr;
-	}
-	
-	return noErr;
+    }
+    else
+    {
+        return paramErr;
+    }
+
+    return noErr;
 }
 
 // Now for some unholy juggling between generic pointers and casting them to Obj-C objects!
@@ -212,186 +222,155 @@ OSErr setImageCursor(CursorRef ref)
 
 NSWindowRef createNSWindow(int x, int y, int width, int height)
 {
-	LLNSWindow *window = [[LLNSWindow alloc]initWithContentRect:NSMakeRect(x, y, width, height)
-													  styleMask:NSTitledWindowMask | NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTexturedBackgroundWindowMask backing:NSBackingStoreBuffered defer:NO];
-	[window makeKeyAndOrderFront:nil];
-	[window setAcceptsMouseMovedEvents:TRUE];
+    LLNSWindow *window = [[LLNSWindow alloc]initWithContentRect:NSMakeRect(x, y, width, height)
+                                                      styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskResizable | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable
+                                                        backing:NSBackingStoreBuffered defer:NO];
+    [window makeKeyAndOrderFront:nil];
+    [window setAcceptsMouseMovedEvents:TRUE];
     [window setRestorable:FALSE]; // Viewer manages state from own settings
-	return window;
+    return window;
 }
 
 GLViewRef createOpenGLView(NSWindowRef window, unsigned int samples, bool vsync)
 {
-	LLOpenGLView *glview = [[LLOpenGLView alloc]initWithFrame:[(LLNSWindow*)window frame] withSamples:samples andVsync:vsync];
-	[(LLNSWindow*)window setContentView:glview];
-	return glview;
-}
-
-void setResizeMode(bool oldresize, void* glview)
-{
-    [(LLOpenGLView *)glview setOldResize:oldresize];
+    LLOpenGLView *glview = [[LLOpenGLView alloc]initWithFrame:[(LLNSWindow*)window frame] withSamples:samples andVsync:vsync];
+    [(LLNSWindow*)window setContentView:glview];
+    return glview;
 }
 
 void glSwapBuffers(void* context)
 {
-	[(NSOpenGLContext*)context flushBuffer];
+    [(NSOpenGLContext*)context flushBuffer];
 }
 
 CGLContextObj getCGLContextObj(GLViewRef view)
 {
-	return [(LLOpenGLView *)view getCGLContextObj];
+    return [(LLOpenGLView *)view getCGLContextObj];
 }
 
 CGLPixelFormatObj* getCGLPixelFormatObj(NSWindowRef window)
 {
-	LLOpenGLView *glview = [(LLNSWindow*)window contentView];
-	return [glview getCGLPixelFormatObj];
+    LLOpenGLView *glview = [(LLNSWindow*)window contentView];
+    return [glview getCGLPixelFormatObj];
 }
 
 unsigned long getVramSize(GLViewRef view)
 {
-	return [(LLOpenGLView *)view getVramSize];
+    return [(LLOpenGLView *)view getVramSize];
 }
 
 float getDeviceUnitSize(GLViewRef view)
 {
-	return [(LLOpenGLView*)view convertSizeToBacking:NSMakeSize(1, 1)].width;
+    return [(LLOpenGLView*)view convertSizeToBacking:NSMakeSize(1, 1)].width;
 }
 
-CGPoint getContentViewBoundsPosition(NSWindowRef window)
+CGRect getContentViewRect(NSWindowRef window)
 {
-	return [[(LLNSWindow*)window contentView] bounds].origin;
+    return [[(LLNSWindow*)window contentView] bounds];
 }
 
-CGSize getContentViewBoundsSize(NSWindowRef window)
+CGRect getBackingViewRect(NSWindowRef window, GLViewRef view)
 {
-	return [[(LLNSWindow*)window contentView] bounds].size;
-}
-
-CGSize getDeviceContentViewSize(NSWindowRef window, GLViewRef view)
-{
-    return [(NSOpenGLView*)view convertRectToBacking:[[(LLNSWindow*)window contentView] bounds]].size;
+    return [(NSOpenGLView*)view convertRectToBacking:[[(LLNSWindow*)window contentView] bounds]];
 }
 
 void getWindowSize(NSWindowRef window, float* size)
 {
-	NSRect frame = [(LLNSWindow*)window frame];
-	size[0] = frame.origin.x;
-	size[1] = frame.origin.y;
-	size[2] = frame.size.width;
-	size[3] = frame.size.height;
+    NSRect frame = [(LLNSWindow*)window frame];
+    size[0] = frame.origin.x;
+    size[1] = frame.origin.y;
+    size[2] = frame.size.width;
+    size[3] = frame.size.height;
 }
 
 void setWindowSize(NSWindowRef window, int width, int height)
 {
-	NSRect frame = [(LLNSWindow*)window frame];
-	frame.size.width = width;
-	frame.size.height = height;
-	[(LLNSWindow*)window setFrame:frame display:TRUE];
+    NSRect frame = [(LLNSWindow*)window frame];
+    frame.size.width = width;
+    frame.size.height = height;
+    [(LLNSWindow*)window setFrame:frame display:TRUE];
 }
 
 void setWindowPos(NSWindowRef window, float* pos)
 {
-	NSPoint point;
-	point.x = pos[0];
-	point.y = pos[1];
-	[(LLNSWindow*)window setFrameOrigin:point];
+    NSPoint point;
+    point.x = pos[0];
+    point.y = pos[1];
+    [(LLNSWindow*)window setFrameOrigin:point];
 }
 
 void getCursorPos(NSWindowRef window, float* pos)
 {
-	NSPoint mLoc;
-	mLoc = [(LLNSWindow*)window mouseLocationOutsideOfEventStream];
-	pos[0] = mLoc.x;
-	pos[1] = mLoc.y;
+    NSPoint mLoc;
+    mLoc = [(LLNSWindow*)window mouseLocationOutsideOfEventStream];
+    pos[0] = mLoc.x;
+    pos[1] = mLoc.y;
 }
 
 void makeWindowOrderFront(NSWindowRef window)
 {
-	[(LLNSWindow*)window makeKeyAndOrderFront:nil];
+    [(LLNSWindow*)window makeKeyAndOrderFront:nil];
 }
 
 void convertScreenToWindow(NSWindowRef window, float *coord)
 {
-	NSRect point;
-	point.origin.x = coord[0];
-	point.origin.y = coord[1];
-	point = [(LLNSWindow*)window convertRectFromScreen:point];
-	coord[0] = point.origin.x;
-	coord[1] = point.origin.y;
+    NSRect point = NSMakeRect(coord[0], coord[1], 0,0);
+    point = [(LLNSWindow*)window convertRectFromScreen:point];
+    coord[0] = point.origin.x;
+    coord[1] = point.origin.y;
 }
 
 void convertRectToScreen(NSWindowRef window, float *coord)
 {
-	NSRect point;
-	point.origin.x = coord[0];
-	point.origin.y = coord[1];
-	point.size.width = coord[2];
-	point.size.height = coord[3];
-	
-	point = [(LLNSWindow*)window convertRectToScreen:point];
-	
-	coord[0] = point.origin.x;
-	coord[1] = point.origin.y;
-	coord[2] = point.size.width;
-	coord[3] = point.size.height;
+    NSRect rect = NSMakeRect(coord[0], coord[1], coord[2], coord[3]);;
+    rect = [(LLNSWindow*)window convertRectToScreen:rect];
+
+    coord[0] = rect.origin.x;
+    coord[1] = rect.origin.y;
+    coord[2] = rect.size.width;
+    coord[3] = rect.size.height;
 }
 
 void convertRectFromScreen(NSWindowRef window, float *coord)
 {
-	NSRect point;
-	point.origin.x = coord[0];
-	point.origin.y = coord[1];
-	point.size.width = coord[2];
-	point.size.height = coord[3];
-	
-	point = [(LLNSWindow*)window convertRectFromScreen:point];
-	
-	coord[0] = point.origin.x;
-	coord[1] = point.origin.y;
-	coord[2] = point.size.width;
-	coord[3] = point.size.height;
-}
+    NSRect point = NSMakeRect(coord[0], coord[1], coord[2], coord[3]);
+    point = [(LLNSWindow*)window convertRectFromScreen:point];
 
-void convertScreenToView(NSWindowRef window, float *coord)
-{
-	NSRect point;
-	point.origin.x = coord[0];
-	point.origin.y = coord[1];
-	point.origin = [(LLNSWindow*)window convertScreenToBase:point.origin];
-	point.origin = [[(LLNSWindow*)window contentView] convertPoint:point.origin fromView:nil];
+    coord[0] = point.origin.x;
+    coord[1] = point.origin.y;
+    coord[2] = point.size.width;
+    coord[3] = point.size.height;
 }
 
 void convertWindowToScreen(NSWindowRef window, float *coord)
 {
-	NSPoint point;
-	point.x = coord[0];
-	point.y = coord[1];
-	point = [(LLNSWindow*)window convertToScreenFromLocalPoint:point relativeToView:[(LLNSWindow*)window contentView]];
-	coord[0] = point.x;
-	coord[1] = point.y;
+    NSRect rect = NSMakeRect(coord[0], coord[1], 0, 0);
+    rect = [(LLNSWindow*)window convertRectToScreen:rect];
+
+      coord[0] = rect.origin.x;
+    coord[1] = [[NSScreen screens][0] frame].size.height - rect.origin.y;
 }
 
 void closeWindow(NSWindowRef window)
 {
-	[(LLNSWindow*)window close];
-	[(LLNSWindow*)window release];
+    [(LLNSWindow*)window close];
+    [(LLNSWindow*)window release];
 }
 
 void removeGLView(GLViewRef view)
 {
-	[(LLOpenGLView*)view clearGLContext];
-	[(LLOpenGLView*)view removeFromSuperview];
+    [(LLOpenGLView*)view clearGLContext];
+    [(LLOpenGLView*)view removeFromSuperview];
 }
 
 void setupInputWindow(NSWindowRef window, GLViewRef glview)
 {
-	[[(LLAppDelegate*)[NSApp delegate] inputView] setGLView:(LLOpenGLView*)glview];
+    [[(LLAppDelegate*)[NSApp delegate] inputView] setGLView:(LLOpenGLView*)glview];
 }
 
 void commitCurrentPreedit(GLViewRef glView)
 {
-	[(LLOpenGLView*)glView commitCurrentPreedit];
+    [(LLOpenGLView*)glView commitCurrentPreedit];
 }
 
 void allowDirectMarkedTextInput(bool allow, GLViewRef glView)
@@ -401,20 +380,20 @@ void allowDirectMarkedTextInput(bool allow, GLViewRef glView)
 
 NSWindowRef getMainAppWindow()
 {
-	LLNSWindow *winRef = [(LLAppDelegate*)[[NSApplication sharedApplication] delegate] window];
-	
-	[winRef setAcceptsMouseMovedEvents:TRUE];
-	return winRef;
+    LLNSWindow *winRef = [(LLAppDelegate*)[[NSApplication sharedApplication] delegate] window];
+
+    [winRef setAcceptsMouseMovedEvents:TRUE];
+    return winRef;
 }
 
 void makeFirstResponder(NSWindowRef window, GLViewRef view)
 {
-	[(LLNSWindow*)window makeFirstResponder:(LLOpenGLView*)view];
+    [(LLNSWindow*)window makeFirstResponder:(LLOpenGLView*)view];
 }
 
 void requestUserAttention()
 {
-	[[NSApplication sharedApplication] requestUserAttention:NSInformationalRequest];
+    [[NSApplication sharedApplication] requestUserAttention:NSInformationalRequest];
 }
 
 long showAlert(std::string text, std::string title, int type)
@@ -422,7 +401,7 @@ long showAlert(std::string text, std::string title, int type)
     long ret = 0;
     @autoreleasepool {
         NSAlert *alert = [[[NSAlert alloc] init] autorelease];
-        
+
         [alert setMessageText:[NSString stringWithCString:title.c_str() encoding:[NSString defaultCStringEncoding]]];
         [alert setInformativeText:[NSString stringWithCString:text.c_str() encoding:[NSString defaultCStringEncoding]]];
         if (type == 0)
@@ -439,7 +418,7 @@ long showAlert(std::string text, std::string title, int type)
         }
         ret = [alert runModal];
     }
-    
+
     if (ret == NSAlertFirstButtonReturn)
     {
         if (type == 1)
@@ -459,7 +438,7 @@ long showAlert(std::string text, std::string title, int type)
             ret = 1;
         }
     }
-    
+
     return ret;
 }
 
@@ -472,5 +451,5 @@ long showAlert(std::string text, std::string title, int type)
 
 unsigned int getModifiers()
 {
-	return [NSEvent modifierFlags];
+    return [NSEvent modifierFlags];
 }
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 6c3be3eef8..f8920318d3 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -279,6 +279,10 @@ void callResetKeys()
 
 bool callUnicodeCallback(wchar_t character, unsigned int mask)
 {
+    if (!gWindowImplementation)
+    {
+        return false;
+    }
     NativeKeyEventData eventData;
 
     memset(&eventData, 0, sizeof(NativeKeyEventData));
@@ -300,7 +304,7 @@ bool callUnicodeCallback(wchar_t character, unsigned int mask)
 
 void callFocus()
 {
-    if (gWindowImplementation)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         gWindowImplementation->getCallbacks()->handleFocus(gWindowImplementation);
     }
@@ -308,7 +312,7 @@ void callFocus()
 
 void callFocusLost()
 {
-    if (gWindowImplementation)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation);
     }
@@ -316,6 +320,10 @@ void callFocusLost()
 
 void callRightMouseDown(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -329,6 +337,10 @@ void callRightMouseDown(float *pos, MASK mask)
 
 void callRightMouseUp(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -342,6 +354,10 @@ void callRightMouseUp(float *pos, MASK mask)
 
 void callLeftMouseDown(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -355,6 +371,10 @@ void callLeftMouseDown(float *pos, MASK mask)
 
 void callLeftMouseUp(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -369,6 +389,10 @@ void callLeftMouseUp(float *pos, MASK mask)
 
 void callDoubleClick(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -382,7 +406,7 @@ void callDoubleClick(float *pos, MASK mask)
 
 void callResize(unsigned int width, unsigned int height)
 {
-    if (gWindowImplementation != NULL)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         gWindowImplementation->getCallbacks()->handleResize(gWindowImplementation, width, height);
     }
@@ -390,6 +414,10 @@ void callResize(unsigned int width, unsigned int height)
 
 void callMouseMoved(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL       outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -403,6 +431,10 @@ void callMouseMoved(float *pos, MASK mask)
 
 void callMouseDragged(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL       outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -424,6 +456,10 @@ void callScrollMoved(float deltaX, float deltaY)
 
 void callMouseExit()
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->getCallbacks()->handleMouseLeave(gWindowImplementation);
 }
 
@@ -475,11 +511,19 @@ void callWindowDidChangeScreen()
 
 void callDeltaUpdate(float *delta, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->updateMouseDeltas(delta);
 }
 
 void callOtherMouseDown(float *pos, MASK mask, int button)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL       outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -500,6 +544,10 @@ void callOtherMouseDown(float *pos, MASK mask, int button)
 
 void callOtherMouseUp(float *pos, MASK mask, int button)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -524,29 +572,45 @@ void callModifier(MASK mask)
 
 void callHandleDragEntered(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_START_TRACKING);
 }
 
 void callHandleDragExited(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_STOP_TRACKING);
 }
 
 void callHandleDragUpdated(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_TRACK);
 }
 
 void callHandleDragDropped(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_DROPPED);
 }
 
 void callQuitHandler()
 {
-    if (gWindowImplementation)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
-        if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation))
+        if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation, true))
         {
             gWindowImplementation->getCallbacks()->handleQuit(gWindowImplementation);
         }
@@ -555,7 +619,7 @@ void callQuitHandler()
 
 void getPreeditSelectionRange(int *position, int *length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->getSelectionRange(position, length);
     }
@@ -563,7 +627,7 @@ void getPreeditSelectionRange(int *position, int *length)
 
 void getPreeditMarkedRange(int *position, int *length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->getPreeditRange(position, length);
     }
@@ -571,7 +635,7 @@ void getPreeditMarkedRange(int *position, int *length)
 
 void setPreeditMarkedRange(int position, int length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->markAsPreedit(position, length);
     }
@@ -580,7 +644,7 @@ void setPreeditMarkedRange(int position, int length)
 bool handleUnicodeCharacter(wchar_t c)
 {
     bool success = false;
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         success = gWindowImplementation->getPreeditor()->handleUnicodeCharHere(c);
     }
@@ -590,7 +654,7 @@ bool handleUnicodeCharacter(wchar_t c)
 
 void resetPreedit()
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->resetPreedit();
     }
@@ -600,7 +664,7 @@ void resetPreedit()
 // This largely mirrors the old implementation, only sans the carbon parameters.
 void setMarkedText(unsigned short *unitext, unsigned int *selectedRange, unsigned int *replacementRange, long text_len, attributedStringInfo segments)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         LLPreeditor *preeditor = gWindowImplementation->getPreeditor();
         preeditor->resetPreedit();
@@ -623,7 +687,7 @@ void setMarkedText(unsigned short *unitext, unsigned int *selectedRange, unsigne
 
 void getPreeditLocation(float *location, unsigned int length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         LLPreeditor *preeditor = gWindowImplementation->getPreeditor();
         LLCoordGL coord;
@@ -921,7 +985,7 @@ bool LLWindowMacOSX::getPosition(LLCoordScreen *position)
     }
     else if(mWindow)
     {
-        const CGPoint & pos = getContentViewBoundsPosition(mWindow);
+        CGPoint pos = getContentViewRect(mWindow).origin;
 
         position->mX = pos.x;
         position->mY = pos.y;
@@ -948,7 +1012,7 @@ bool LLWindowMacOSX::getSize(LLCoordScreen *size)
     }
     else if(mWindow)
     {
-        const CGSize & sz = gHiDPISupport ? getDeviceContentViewSize(mWindow, mGLView) : getContentViewBoundsSize(mWindow);
+        CGSize sz = getBackingViewRect(mWindow, mGLView).size;
 
         size->mX = sz.width;
         size->mY = sz.height;
@@ -974,7 +1038,7 @@ bool LLWindowMacOSX::getSize(LLCoordWindow *size)
     }
     else if(mWindow)
     {
-        const CGSize & sz = gHiDPISupport ? getDeviceContentViewSize(mWindow, mGLView) : getContentViewBoundsSize(mWindow);
+        CGSize sz = getBackingViewRect(mWindow, mGLView).size;
 
         size->mX = sz.width;
         size->mY = sz.height;
@@ -1160,6 +1224,12 @@ void LLWindowMacOSX::setMouseClipping( bool b )
     adjustCursorDecouple();
 }
 
+#if LL_DARWIN
+// For CGSetLocalEventsSuppressionInterval there is no replacement in modern API
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 bool LLWindowMacOSX::setCursorPosition(const LLCoordWindow position)
 {
     bool result = false;
@@ -1189,14 +1259,15 @@ bool LLWindowMacOSX::setCursorPosition(const LLCoordWindow position)
     // trigger mouse move callback
     LLCoordGL gl_pos;
     convertCoords(position, &gl_pos);
-    float scale = getSystemUISize();
-    gl_pos.mX *= scale;
-    gl_pos.mY *= scale;
     mCallbacks->handleMouseMove(this, gl_pos, (MASK)0);
 
     return result;
 }
 
+#if LL_DARWIN
+#pragma clang diagnostic pop
+#endif
+
 bool LLWindowMacOSX::getCursorPosition(LLCoordWindow *position)
 {
     float cursor_point[2];
@@ -1421,8 +1492,9 @@ bool LLWindowMacOSX::convertCoords(LLCoordScreen from, LLCoordWindow* to)
 
         convertScreenToWindow(mWindow, mouse_point);
 
-        to->mX = mouse_point[0];
-        to->mY = mouse_point[1];
+        float scale_factor = getSystemUISize();
+        to->mX = mouse_point[0] * scale_factor;
+        to->mY = mouse_point[1] * scale_factor;
 
         return true;
     }
@@ -1434,9 +1506,9 @@ bool LLWindowMacOSX::convertCoords(LLCoordWindow from, LLCoordScreen *to)
     if(mWindow)
     {
         float mouse_point[2];
-
-        mouse_point[0] = from.mX;
-        mouse_point[1] = from.mY;
+        float scale_factor = getSystemUISize();
+        mouse_point[0] = from.mX / scale_factor;
+        mouse_point[1] = from.mY / scale_factor;
 
         convertWindowToScreen(mWindow, mouse_point);
 
@@ -2573,7 +2645,7 @@ MASK LLWindowMacOSX::modifiersToMask(S16 modifiers)
 
 F32 LLWindowMacOSX::getSystemUISize()
 {
-    return gHiDPISupport ? ::getDeviceUnitSize(mGLView) : LLWindow::getSystemUISize();
+    return ::getDeviceUnitSize(mGLView);
 }
 
 #if LL_OS_DRAGDROP_ENABLED
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 7de1a40d93..d703a84d02 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -63,6 +63,7 @@ public:
     bool switchContext(bool fullscreen, const LLCoordScreen &size, bool enable_vsync, const LLCoordScreen * const posp = NULL) override;
     bool setCursorPosition(LLCoordWindow position) override;
     bool getCursorPosition(LLCoordWindow *position) override;
+    bool isWrapMouse() const override { return !mCursorDecoupled; };
     void showCursor() override;
     void hideCursor() override;
     void showCursorFromMouseMove() override;
@@ -174,9 +175,6 @@ protected:
 
     bool    shouldPostQuit() { return mPostQuit; }
 
-    //Satisfy MAINT-3135 and MAINT-3288 with a flag.
-    /*virtual */ void setOldResize(bool oldresize) override {setResizeMode(oldresize, mGLView); }
-
 private:
     void restoreGLContext();
 
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 7433ad6bd2..05be319c0b 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1881,7 +1881,7 @@ void LLWindowSDL::gatherInput()
         {
             // *FIX: More informative dialog?
             LL_INFOS() << "Could not recreate context after resize! Quitting..." << LL_ENDL;
-            if(mCallbacks->handleCloseRequest(this))
+            if(mCallbacks->handleCloseRequest(this, false))
                 {
                     // Get the app to initiate cleanup.
                     mCallbacks->handleQuit(this);
@@ -1931,7 +1931,7 @@ void LLWindowSDL::gatherInput()
                 break;
 
             case SDL_QUIT:
-                if(mCallbacks->handleCloseRequest(this))
+                if(mCallbacks->handleCloseRequest(this, true))
                 {
                     // Get the app to initiate cleanup.
                     mCallbacks->handleQuit(this);
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 196ad2986d..521d52df30 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -68,6 +68,7 @@ public:
     /*virtual*/ bool switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync, const LLCoordScreen * const posp = NULL);
     /*virtual*/ bool setCursorPosition(LLCoordWindow position);
     /*virtual*/ bool getCursorPosition(LLCoordWindow *position);
+    /*virtual*/ bool isWrapMouse() const override { return true; }
     /*virtual*/ void showCursor();
     /*virtual*/ void hideCursor();
     /*virtual*/ void showCursorFromMouseMove();
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 832cf254d1..f826a60ddd 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -76,6 +76,11 @@
 #pragma comment(lib, "dxguid.lib") // needed for llurlentry test to build on some systems
 #pragma comment(lib, "dinput8")
 
+#pragma comment(lib, "UxTheme.lib")
+#pragma comment(lib, "Dwmapi.lib")
+#include <Uxtheme.h>
+#include <dwmapi.h> // needed for DwmSetWindowAttribute to set window theme
+
 const S32   MAX_MESSAGE_PER_UPDATE = 20;
 const S32   BITS_PER_PIXEL = 32;
 const S32   MAX_NUM_RESOLUTIONS = 32;
@@ -85,6 +90,10 @@ const F32   ICON_FLASH_TIME = 0.5f;
 #define USER_DEFAULT_SCREEN_DPI 96 // Win7
 #endif
 
+#ifndef WM_DWMCOLORIZATIONCOLORCHANGED
+#define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320
+#endif
+
 // Claim a couple unused GetMessage() message IDs
 const UINT WM_DUMMY_(WM_USER + 0x0017);
 const UINT WM_POST_FUNCTION_(WM_USER + 0x0018);
@@ -104,6 +113,7 @@ static std::thread::id sMainThreadId;
 
 
 LPWSTR gIconResource = IDI_APPLICATION;
+LPWSTR gIconSmallResource = IDI_APPLICATION;
 LPDIRECTINPUT8 gDirectInput8;
 
 LLW32MsgCallback gAsyncMsgCallback = NULL;
@@ -137,6 +147,17 @@ typedef HRESULT(STDAPICALLTYPE *GetDpiForMonitorType)(
     _Out_ UINT *dpiX,
     _Out_ UINT *dpiY);
 
+typedef enum PREFERRED_APP_MODE
+{
+    DEFAULT,
+    ALLOW_DARK,
+    FORCE_DARK,
+    FORCE_LIGHT,
+    MAX
+} PREFERRED_APP_MODE;
+
+typedef PREFERRED_APP_MODE(WINAPI* fnSetPreferredAppMode)(PREFERRED_APP_MODE mode);
+
 //
 // LLWindowWin32
 //
@@ -350,10 +371,14 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     LLWindowWin32Thread();
 
     void run() override;
-    void close() override;
 
-    // closes queue, wakes thread, waits until thread closes
-    void wakeAndDestroy();
+    // Detroys handles and window
+    // Either post to or call from window thread
+    void destroyWindow();
+
+    // Closes queue, wakes thread, waits until thread closes.
+    // Call from main thread
+    bool wakeAndDestroy();
 
     void glReady()
     {
@@ -410,6 +435,7 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     // until after some graphics setup. See SL-20177. -Cosmic,2023-09-18
     bool mGLReady = false;
     bool mGotGLBuffer = false;
+    LLAtomicBool mDeleteOnExit = false;
 };
 
 
@@ -424,6 +450,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
                              F32 max_gl_version)
     :
     LLWindow(callbacks, fullscreen, flags),
+    mAbsoluteCursorPosition(false),
     mMaxGLVersion(max_gl_version),
     mMaxCores(max_cores)
 {
@@ -507,6 +534,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
 
     mFSAASamples = fsaa_samples;
     mIconResource = gIconResource;
+    mIconSmallResource = gIconSmallResource;
     mOverrideAspectRatio = 0.f;
     mNativeAspectRatio = 0.f;
     mInputProcessingPaused = false;
@@ -695,8 +723,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
             }
 
             if (dev_mode.dmPelsWidth == width &&
-                dev_mode.dmPelsHeight == height &&
-                dev_mode.dmBitsPerPel == BITS_PER_PIXEL)
+                dev_mode.dmPelsHeight == height)
             {
                 success = true;
                 if ((dev_mode.dmDisplayFrequency - current_refresh)
@@ -736,7 +763,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
         // If we found a good resolution, use it.
         if (success)
         {
-            success = setDisplayResolution(width, height, BITS_PER_PIXEL, closest_refresh);
+            success = setDisplayResolution(width, height, closest_refresh);
         }
 
         // Keep a copy of the actual current device mode in case we minimize
@@ -749,7 +776,6 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
             mFullscreen = true;
             mFullscreenWidth   = dev_mode.dmPelsWidth;
             mFullscreenHeight  = dev_mode.dmPelsHeight;
-            mFullscreenBits    = dev_mode.dmBitsPerPel;
             mFullscreenRefresh = dev_mode.dmDisplayFrequency;
 
             LL_INFOS("Window") << "Running at " << dev_mode.dmPelsWidth
@@ -763,7 +789,6 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
             mFullscreen = false;
             mFullscreenWidth   = -1;
             mFullscreenHeight  = -1;
-            mFullscreenBits    = -1;
             mFullscreenRefresh = -1;
 
             std::map<std::string,std::string> args;
@@ -786,7 +811,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
     //  }
 
     // SL-12971 dual GPU display
-    DISPLAY_DEVICEA display_device;
+    DISPLAY_DEVICE display_device;
     int             display_index = -1;
     DWORD           display_flags = 0; // EDD_GET_DEVICE_INTERFACE_NAME ?
     const size_t    display_bytes = sizeof(display_device);
@@ -797,23 +822,23 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
         {
             // CHAR DeviceName  [ 32] Adapter name
             // CHAR DeviceString[128]
-            CHAR text[256];
+            WCHAR text[256];
 
-            size_t name_len = strlen(display_device.DeviceName  );
-            size_t desc_len = strlen(display_device.DeviceString);
+            size_t name_len = lstrlen(display_device.DeviceName  );
+            size_t desc_len = lstrlen(display_device.DeviceString);
 
-            const CHAR *name = name_len ? display_device.DeviceName   : "???";
-            const CHAR *desc = desc_len ? display_device.DeviceString : "???";
+            const WCHAR *name = name_len ? display_device.DeviceName   : TEXT("???");
+            const WCHAR *desc = desc_len ? display_device.DeviceString : TEXT("???");
 
-            sprintf(text, "Display Device %d: %s, %s", display_index, name, desc);
-            LL_INFOS("Window") << text << LL_ENDL;
+            wsprintf(text, TEXT("Display Device %d: %s, %s"), display_index, name, desc);
+            LL_INFOS("Window") << ll_convert<std::string>(std::wstring(text)) << LL_ENDL;
         }
 
         ::ZeroMemory(&display_device,display_bytes);
         display_device.cb = display_bytes;
 
         display_index++;
-    }  while( EnumDisplayDevicesA(NULL, display_index, &display_device, display_flags ));
+    }  while( EnumDisplayDevices(NULL, display_index, &display_device, display_flags ));
 
     LL_INFOS("Window") << "Total Display Devices: " << display_index << LL_ENDL;
 
@@ -842,6 +867,8 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
     // Initialize (boot strap) the Language text input management,
     // based on the system's (or user's) default settings.
     allowLanguageTextInput(NULL, false);
+    updateWindowTheme();
+    setCustomIcon();
 }
 
 
@@ -853,6 +880,7 @@ LLWindowWin32::~LLWindowWin32()
     }
 
     delete mDragDrop;
+    mDragDrop = NULL;
 
     delete [] mWindowTitle;
     mWindowTitle = NULL;
@@ -864,6 +892,7 @@ LLWindowWin32::~LLWindowWin32()
     mWindowClassName = NULL;
 
     delete mWindowThread;
+    mWindowThread = NULL;
 }
 
 void LLWindowWin32::show()
@@ -972,7 +1001,7 @@ void LLWindowWin32::close()
     // Restore gamma to the system values.
     restoreGamma();
 
-    LL_DEBUGS("Window") << "Destroying Window" << LL_ENDL;
+    LL_INFOS("Window") << "Cleanup and destruction of Window Thread" << LL_ENDL;
 
     if (sWindowHandleForMessageBox == mWindowHandle)
     {
@@ -982,7 +1011,11 @@ void LLWindowWin32::close()
     mhDC = NULL;
     mWindowHandle = NULL;
 
-    mWindowThread->wakeAndDestroy();
+    if (mWindowThread->wakeAndDestroy())
+    {
+        // thread will delete itselfs once done
+        mWindowThread = NULL;
+    }
 }
 
 bool LLWindowWin32::isValid()
@@ -1185,7 +1218,7 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo
         // If we found a good resolution, use it.
         if (success)
         {
-            success = setDisplayResolution(width, height, BITS_PER_PIXEL, closest_refresh);
+            success = setDisplayResolution(width, height, closest_refresh);
         }
 
         // Keep a copy of the actual current device mode in case we minimize
@@ -1197,7 +1230,6 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo
             mFullscreen = true;
             mFullscreenWidth = dev_mode.dmPelsWidth;
             mFullscreenHeight = dev_mode.dmPelsHeight;
-            mFullscreenBits = dev_mode.dmBitsPerPel;
             mFullscreenRefresh = dev_mode.dmDisplayFrequency;
 
             LL_INFOS("Window") << "Running at " << dev_mode.dmPelsWidth
@@ -1223,7 +1255,6 @@ bool LLWindowWin32::switchContext(bool fullscreen, const LLCoordScreen& size, bo
             mFullscreen = false;
             mFullscreenWidth = -1;
             mFullscreenHeight = -1;
-            mFullscreenBits = -1;
             mFullscreenRefresh = -1;
 
             LL_INFOS("Window") << "Unable to run fullscreen at " << width << "x" << height << LL_ENDL;
@@ -1666,6 +1697,11 @@ const   S32   max_format  = (S32)num_formats - 1;
         return false;
     }
 
+    // Setup Tracy gpu context
+    {
+        LL_PROFILER_GPU_CONTEXT;
+    }
+
     // Disable vertical sync for swap
     toggleVSync(enable_vsync);
 
@@ -1697,8 +1733,6 @@ const   S32   max_format  = (S32)num_formats - 1;
         swapBuffers();
     }
 
-    LL_PROFILER_GPU_CONTEXT;
-
     return true;
 }
 
@@ -1931,7 +1965,7 @@ void LLWindowWin32::setTitle(const std::string title)
     // to support non-ascii usernames (and region names?)
     mWindowThread->post([=]()
         {
-            SetWindowTextA(mWindowHandle, title.c_str());
+            SetWindowText(mWindowHandle, ll_convert<std::wstring>(title).c_str());
         });
 }
 
@@ -2431,10 +2465,13 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
         case WM_CLOSE:
         {
             LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_CLOSE");
+            // todo: WM_CLOSE can be caused by user and by task manager,
+            // distinguish these cases.
+            // For now assume it is always user.
             window_imp->post([=]()
                 {
                     // Will the app allow the window to close?
-                    if (window_imp->mCallbacks->handleCloseRequest(window_imp))
+                    if (window_imp->mCallbacks->handleCloseRequest(window_imp, true))
                     {
                         // Get the app to initiate cleanup.
                         window_imp->mCallbacks->handleQuit(window_imp);
@@ -2452,6 +2489,47 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
             }
             return 0;
         }
+        case WM_QUERYENDSESSION:
+        {
+            // Generally means that OS is going to shut down or user is going to log off.
+            // Can use ShutdownBlockReasonCreate here.
+            LL_INFOS("Window") << "Received WM_QUERYENDSESSION with wParam: " << (U32)w_param << " lParam: " << (U32)l_param << LL_ENDL;
+            return TRUE; // 1 = ok to end session. 0 no longer works by itself, use ShutdownBlockReasonCreate
+        }
+        case WM_ENDSESSION:
+        {
+            // OS session is shutting down, initiate cleanup.
+            // Comes after WM_QUERYENDSESSION
+            LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_ENDSESSION");
+            LL_INFOS("Window") << "Received WM_ENDSESSION with wParam: " << (U32)w_param << " lParam: " << (U32)l_param << LL_ENDL;
+            unsigned int end_session_flags = (U32)l_param;
+
+            if (w_param == TRUE // if true, session is ending
+                || end_session_flags == 0 // not possible to determine type of the event
+                // || (end_session_flags & ENDSESSION_CLOSEAPP)) system update or low resources, must be acompanied by w_param == TRUE
+                || (end_session_flags & ENDSESSION_CRITICAL) // will shutdown regardless of app state
+                || (end_session_flags & ENDSESSION_LOGOFF)) // logoff, can delay shutdown
+            {
+                window_imp->post([=]()
+                {
+                    // Check if app needs cleanup or can be closed immediately.
+                    if (window_imp->mCallbacks->handleSessionExit(window_imp))
+                    {
+                        // Get the app to initiate cleanup.
+                        window_imp->mCallbacks->handleQuit(window_imp);
+                    }
+                });
+                // Give app a second to finish up. That's not enough for a clean exit,
+                // but better than nothing.
+                // Todo: sync this better, some kind of waitForResult? Can't wait forever,
+                // but for ENDSESSION_LOGOFF can potentially use ShutdownBlockReasonCreate
+                // for a bigger delay.
+                ms_sleep(1000);
+            }
+            // Don't need to post quit or destroy window,
+            // if session is ending OS is going to take care of it.
+            return 0;
+        }
         case WM_COMMAND:
         {
             LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_COMMAND");
@@ -3012,6 +3090,17 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                     WINDOW_IMP_POST(window_imp->mMouseVanish = true);
                 }
             }
+            // Check if theme-related settings changed
+            else if (l_param && (wcscmp((LPCWSTR)l_param, L"ImmersiveColorSet") == 0))
+            {
+                WINDOW_IMP_POST(window_imp->updateWindowTheme());
+            }
+        }
+        break;
+
+        case WM_DWMCOLORIZATIONCOLORCHANGED:
+        {
+            WINDOW_IMP_POST(window_imp->updateWindowTheme());
         }
         break;
 
@@ -3065,6 +3154,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                         prev_absolute_x = absolute_x;
                         prev_absolute_y = absolute_y;
+                        window_imp->mAbsoluteCursorPosition = true;
                     }
                     else
                     {
@@ -3081,6 +3171,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                             window_imp->mRawMouseDelta.mX += (S32)round((F32)raw->data.mouse.lLastX * (F32)speed / DEFAULT_SPEED);
                             window_imp->mRawMouseDelta.mY -= (S32)round((F32)raw->data.mouse.lLastY * (F32)speed / DEFAULT_SPEED);
                         }
+                        window_imp->mAbsoluteCursorPosition = false;
                     }
                 }
             }
@@ -3104,10 +3195,14 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
         break;
         }
     }
-    else
+    else // (NULL == window_imp)
     {
-        // (NULL == window_imp)
         LL_DEBUGS("Window") << "No window implementation to handle message with, message code: " << U32(u_msg) << LL_ENDL;
+        if (u_msg == WM_DESTROY)
+        {
+            PostQuitMessage(0);  // Posts WM_QUIT with an exit code of 0
+            return 0;
+        }
     }
 
     // pass unhandled messages down to Windows
@@ -3241,7 +3336,7 @@ bool LLWindowWin32::pasteTextFromClipboard(LLWString &dst)
                 WCHAR *utf16str = (WCHAR*) GlobalLock(h_data);
                 if (utf16str)
                 {
-                    dst = utf16str_to_wstring(utf16str);
+                    dst = ll_convert<LLWString>(std::wstring(utf16str));
                     LLWStringUtil::removeWindowsCR(dst);
                     GlobalUnlock(h_data);
                     success = true;
@@ -3266,8 +3361,8 @@ bool LLWindowWin32::copyTextToClipboard(const LLWString& wstr)
         // Provide a copy of the data in Unicode format.
         LLWString sanitized_string(wstr);
         LLWStringUtil::addCRLF(sanitized_string);
-        llutf16string out_utf16 = wstring_to_utf16str(sanitized_string);
-        const size_t size_utf16 = (out_utf16.length() + 1) * sizeof(WCHAR);
+        std::wstring out_utf16 = ll_convert<std::wstring>(sanitized_string);
+        const size_t size_utf16 = (out_utf16.length() + 1) * sizeof(wchar_t);
 
         // Memory is allocated and then ownership of it is transfered to the system.
         HGLOBAL hglobal_copy_utf16 = GlobalAlloc(GMEM_MOVEABLE, size_utf16);
@@ -3517,7 +3612,7 @@ F32 LLWindowWin32::getPixelAspectRatio()
 
 // Change display resolution.  Returns true if successful.
 // protected
-bool LLWindowWin32::setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh)
+bool LLWindowWin32::setDisplayResolution(S32 width, S32 height, S32 refresh)
 {
     DEVMODE dev_mode;
     ::ZeroMemory(&dev_mode, sizeof(DEVMODE));
@@ -3529,7 +3624,6 @@ bool LLWindowWin32::setDisplayResolution(S32 width, S32 height, S32 bits, S32 re
     {
         if (dev_mode.dmPelsWidth        == width &&
             dev_mode.dmPelsHeight       == height &&
-            dev_mode.dmBitsPerPel       == bits &&
             dev_mode.dmDisplayFrequency == refresh )
         {
             // ...display mode identical, do nothing
@@ -3541,9 +3635,8 @@ bool LLWindowWin32::setDisplayResolution(S32 width, S32 height, S32 bits, S32 re
     dev_mode.dmSize = sizeof(dev_mode);
     dev_mode.dmPelsWidth        = width;
     dev_mode.dmPelsHeight       = height;
-    dev_mode.dmBitsPerPel       = bits;
     dev_mode.dmDisplayFrequency = refresh;
-    dev_mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY;
+    dev_mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY;
 
     // CDS_FULLSCREEN indicates that this is a temporary change to the device mode.
     LONG cds_result = ChangeDisplaySettings(&dev_mode, CDS_FULLSCREEN);
@@ -3553,7 +3646,7 @@ bool LLWindowWin32::setDisplayResolution(S32 width, S32 height, S32 bits, S32 re
     if (!success)
     {
         LL_WARNS("Window") << "setDisplayResolution failed, "
-            << width << "x" << height << "x" << bits << " @ " << refresh << LL_ENDL;
+            << width << "x" << height << " @ " << refresh << LL_ENDL;
     }
 
     return success;
@@ -3564,7 +3657,7 @@ bool LLWindowWin32::setFullscreenResolution()
 {
     if (mFullscreen)
     {
-        return setDisplayResolution( mFullscreenWidth, mFullscreenHeight, mFullscreenBits, mFullscreenRefresh);
+        return setDisplayResolution( mFullscreenWidth, mFullscreenHeight, mFullscreenRefresh);
     }
     else
     {
@@ -3629,7 +3722,7 @@ void LLSplashScreenWin32::showImpl()
     ShowWindow(mWindow, SW_SHOW);
 
     // Should set taskbar text without creating a header for the window (caption)
-    SetWindowTextA(mWindow, "Second Life");
+    SetWindowText(mWindow, TEXT("Second Life"));
 }
 
 
@@ -3766,8 +3859,7 @@ void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url, bool async)
     // reliablly on Vista.
 
     // this is madness.. no, this is..
-    LLWString url_wstring = utf8str_to_wstring( escaped_url );
-    llutf16string url_utf16 = wstring_to_utf16str( url_wstring );
+    std::wstring url_utf16 = ll_convert<std::wstring>(escaped_url);
 
     // let the OS decide what to use to open the URL
     SHELLEXECUTEINFO sei = { sizeof( sei ) };
@@ -4040,14 +4132,22 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont)
         break;
     }
 
-    logfont->lfHeight = mPreeditor->getPreeditFontSize();
+    if (mPreeditor)
+    {
+        logfont->lfHeight = mPreeditor->getPreeditFontSize();
+    }
+    else
+    {
+        // todo: extract from some font * LLUI::getScaleFactor() intead
+        logfont->lfHeight = 10;
+    }
     logfont->lfWeight = FW_NORMAL;
 }
 
 U32 LLWindowWin32::fillReconvertString(const LLWString &text,
     S32 focus, S32 focus_length, RECONVERTSTRING *reconvert_string)
 {
-    const llutf16string text_utf16 = wstring_to_utf16str(text);
+    const std::wstring text_utf16 = ll_convert<std::wstring>(text);
     const DWORD required_size = sizeof(RECONVERTSTRING) + (static_cast<DWORD>(text_utf16.length()) + 1) * sizeof(WCHAR);
     if (reconvert_string && reconvert_string->dwSize >= required_size)
     {
@@ -4147,7 +4247,7 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
             size = LLWinImm::getCompositionString(himc, GCS_RESULTSTR, data, size);
             if (size > 0)
             {
-                result_string = utf16str_to_wstring(llutf16string(data, size / sizeof(WCHAR)));
+                result_string = ll_convert_wide_to_wstring(std::wstring(data, size / sizeof(WCHAR)));
             }
             delete[] data;
             needs_update = true;
@@ -4164,7 +4264,7 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
             if (size > 0)
             {
                 preedit_string_utf16_length = size / sizeof(WCHAR);
-                preedit_string = utf16str_to_wstring(llutf16string(data, size / sizeof(WCHAR)));
+                preedit_string = ll_convert_wide_to_wstring(std::wstring(data, size / sizeof(WCHAR)));
             }
             delete[] data;
             needs_update = true;
@@ -4571,25 +4671,11 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
 #endif // LL_WINDOWS
 
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
-    : LL::ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, true /*should be false, temporary workaround for SL-18721*/)
+    : LL::ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, false)
 {
     LL::ThreadPool::start();
 }
 
-void LLWindowWin32::LLWindowWin32Thread::close()
-{
-    if (!mQueue->isClosed())
-    {
-        LL_WARNS() << "Closing window thread without using destroy_window_handler" << LL_ENDL;
-        LL::ThreadPool::close();
-
-        // Workaround for SL-18721 in case window closes too early and abruptly
-        LLSplashScreen::show();
-        LLSplashScreen::update("..."); // will be updated later
-    }
-}
-
-
 /**
  * LogChange is to log changes in status while trying to avoid spamming the
  * log with repeated messages, especially in a tight loop. It refuses to log
@@ -4684,9 +4770,18 @@ void LLWindowWin32::LLWindowWin32Thread::checkDXMem()
 
                         if (phys_mb > 0)
                         {
-                            // Intel uses 'shared' vram, cap it to 25% of total memory
-                            // Todo: consider caping all adapters at least to 50% ram
-                            budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.25));
+                            if (gGLManager.mIsIntel)
+                            {
+                                // Intel uses 'shared' vram, cap it to 25% of total memory
+                                // Todo: consider a way of detecting integrated Intel and AMD
+                                budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.25));
+                            }
+                            else
+                            {
+                                // More budget is generally better, but the way viewer
+                                // utilizes even dedicated VRAM leaves a footprint in RAM
+                                budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.75));
+                            }
                         }
                         else
                         {
@@ -4804,108 +4899,102 @@ void LLWindowWin32::LLWindowWin32Thread::run()
         }
 #endif
     }
+
+    destroyWindow();
+
+    if (mDeleteOnExit)
+    {
+        delete this;
+    }
 }
 
-void LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
+void LLWindowWin32::LLWindowWin32Thread::destroyWindow()
+{
+    if (mWindowHandleThrd != NULL && IsWindow(mWindowHandleThrd))
+            {
+                if (mhDCThrd)
+                {
+                    if (!ReleaseDC(mWindowHandleThrd, mhDCThrd))
+                    {
+                        LL_WARNS("Window") << "Release of ghDC failed!" << LL_ENDL;
+                    }
+                    mhDCThrd = NULL;
+                }
+
+                // This causes WM_DESTROY to be sent *immediately*
+                if (!destroy_window_handler(mWindowHandleThrd))
+                {
+                    LL_WARNS("Window") << "Failed to destroy Window! " << std::hex << GetLastError() << LL_ENDL;
+                }
+            }
+            else
+            {
+                // Something killed the window while we were busy destroying gl or handle somehow got broken
+                LL_WARNS("Window") << "Failed to destroy Window, invalid handle!" << LL_ENDL;
+            }
+            mWindowHandleThrd = NULL;
+            mhDCThrd = NULL;
+}
+
+bool LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
 {
     if (mQueue->isClosed())
     {
-        LL_WARNS() << "Tried to close Queue. Win32 thread Queue already closed." << LL_ENDL;
-        return;
+        LL_WARNS("Window") << "Tried to close Queue. Win32 thread Queue already closed." << LL_ENDL;
+        return false;
     }
 
-    // Make sure we don't leave a blank toolbar button.
-    // Also hiding window now prevents user from suspending it
-    // via some action (like dragging it around)
-    ShowWindow(mWindowHandleThrd, SW_HIDE);
+    // Stop checking budget
+    mGLReady = false;
 
-    // Schedule destruction
+    // Capture current handle before we lose it
     HWND old_handle = mWindowHandleThrd;
-    post([this]()
-         {
-             if (IsWindow(mWindowHandleThrd))
-             {
-                 if (mhDCThrd)
-                 {
-                     if (!ReleaseDC(mWindowHandleThrd, mhDCThrd))
-                     {
-                         LL_WARNS("Window") << "Release of ghDC failed!" << LL_ENDL;
-                     }
-                     mhDCThrd = NULL;
-                 }
-
-                 // This causes WM_DESTROY to be sent *immediately*
-                 if (!destroy_window_handler(mWindowHandleThrd))
-                 {
-                     LL_WARNS("Window") << "Failed to destroy Window! " << std::hex << GetLastError() << LL_ENDL;
-                 }
-             }
-             else
-             {
-                 // Something killed the window while we were busy destroying gl or handle somehow got broken
-                 LL_WARNS("Window") << "Failed to destroy Window, invalid handle!" << LL_ENDL;
-             }
-             mWindowHandleThrd = NULL;
-             mhDCThrd = NULL;
-             mGLReady = false;
-         });
-
-    LL_DEBUGS("Window") << "Closing window's pool queue" << LL_ENDL;
-    mQueue->close();
 
-    // Post a nonsense user message to wake up the thread in
-    // case it is waiting for a getMessage()
+    // Clear the user data to prevent callbacks from finding us
     if (old_handle)
     {
-        WPARAM wparam{ 0xB0B0 };
-        LL_DEBUGS("Window") << "PostMessage(" << std::hex << old_handle
-            << ", " << WM_DUMMY_
-            << ", " << wparam << ")" << std::dec << LL_ENDL;
-        PostMessage(old_handle, WM_DUMMY_, wparam, 0x1337);
+        SetWindowLongPtr(old_handle, GWLP_USERDATA, NULL);
     }
 
-    // There are cases where window will refuse to close,
-    // can't wait forever on join, check state instead
-    LLTimer timeout;
-    timeout.setTimerExpirySec(2.0);
-    while (!getQueue().done() && !timeout.hasExpired() && mWindowHandleThrd)
-    {
-        ms_sleep(100);
-    }
+    // Signal thread to clean up when done
+    mDeleteOnExit = true;
 
-    if (getQueue().done() || mWindowHandleThrd == NULL)
+    LL_INFOS("Window") << "Detaching window's thread" << LL_ENDL;
+    // Cleanly detach threads instead of joining them to avoid blocking the main thread
+    // This is acceptable since the thread will self-delete with mDeleteOnExit
+    // Doing it before close() to make sure thread doesn't die before or mid detach.
+    for (auto& pair : mThreads)
     {
-        // Window is closed, started closing or is cleaning up
-        // now wait for our single thread to die.
-        if (mWindowHandleThrd)
-        {
-            LL_INFOS("Window") << "Window is closing, waiting on pool's thread to join, time since post: " << timeout.getElapsedSeconds() << "s" << LL_ENDL;
+        try {
+            // Only detach if the thread is joinable
+            if (pair.second.joinable())
+            {
+                pair.second.detach();
+            }
         }
-        else
-        {
-            LL_DEBUGS("Window") << "Waiting on pool's thread, time since post: " << timeout.getElapsedSeconds() << "s" << LL_ENDL;
-        }
-        for (auto& pair : mThreads)
-        {
-            pair.second.join();
+        catch (const std::system_error& e) {
+            LL_WARNS("Window") << "Exception detaching thread: " << e.what() << LL_ENDL;
         }
     }
-    else
+
+    // Close the queue.
+    LL_INFOS("Window") << "Closing window's pool queue" << LL_ENDL;
+    mQueue->close();
+
+    // Wake up the thread if it's stuck in GetMessage()
+    if (old_handle)
     {
-        // Something suspended window thread, can't afford to wait forever
-        // so kill thread instead
-        // Ex: This can happen if user starts dragging window arround (if it
-        // was visible) or a modal notification pops up
-        LL_WARNS("Window") << "Window is frozen, couldn't perform clean exit" << LL_ENDL;
+        WPARAM wparam{ 0xB0B0 };
+        LL_DEBUGS("Window") << "PostMessage(" << std::hex << old_handle
+            << ", " << WM_DUMMY_
+            << ", " << wparam << ")" << std::dec << LL_ENDL;
 
-        for (auto& pair : mThreads)
-        {
-            // very unsafe
-            TerminateThread(pair.second.native_handle(), 0);
-            pair.second.detach();
-        }
+        // Use PostMessage to signal thread to wake up
+        PostMessage(old_handle, WM_DUMMY_, wparam, 0x1337);
     }
-    LL_DEBUGS("Window") << "thread pool shutdown complete" << LL_ENDL;
+
+    LL_INFOS("Window") << "Thread pool shutdown complete" << LL_ENDL;
+    return true;
 }
 
 void LLWindowWin32::post(const std::function<void()>& func)
@@ -4952,3 +5041,69 @@ void LLWindowWin32::updateWindowRect()
             });
     }
 }
+
+bool LLWindowWin32::isSystemAppDarkMode()
+{
+    HKEY  hKey;
+    DWORD dwValue = 1; // Default to light theme
+    DWORD dwSize  = sizeof(DWORD);
+
+    // Check registry for system theme preference
+    LSTATUS ret_code =
+        RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", 0, KEY_READ, &hKey);
+    if (ERROR_SUCCESS == ret_code)
+    {
+        if (RegQueryValueExW(hKey, L"AppsUseLightTheme", NULL, NULL, (LPBYTE)&dwValue, &dwSize) != ERROR_SUCCESS)
+        {
+            // If AppsUseLightTheme is not found, check SystemUsesLightTheme
+            dwSize = sizeof(DWORD);
+            RegQueryValueExW(hKey, L"SystemUsesLightTheme", NULL, NULL, (LPBYTE)&dwValue, &dwSize);
+        }
+        RegCloseKey(hKey);
+    }
+
+    // Return true if dark mode
+    return dwValue == 0;
+}
+
+void LLWindowWin32::updateWindowTheme()
+{
+    bool use_dark_mode = isSystemAppDarkMode();
+    if (use_dark_mode == mCurrentDarkMode)
+    {
+        return;
+    }
+    mCurrentDarkMode = use_dark_mode;
+
+    HMODULE hUxTheme = LoadLibraryExW(L"uxtheme.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+    if (hUxTheme)
+    {
+        auto SetPreferredAppMode = (fnSetPreferredAppMode)GetProcAddress(hUxTheme, "SetPreferredAppMode");
+        if (SetPreferredAppMode)
+        {
+            SetPreferredAppMode(use_dark_mode ? ALLOW_DARK : FORCE_LIGHT);
+        }
+        FreeLibrary(hUxTheme);
+    }
+    BOOL dark_mode(use_dark_mode);
+    DwmSetWindowAttribute(mWindowHandle, DWMWA_USE_IMMERSIVE_DARK_MODE, &dark_mode, sizeof(dark_mode));
+
+    LL_INFOS("Window") << "Viewer window theme is set to " << (use_dark_mode ? "dark" : "light") << " mode" << LL_ENDL;
+}
+
+void LLWindowWin32::setCustomIcon()
+{
+        if (mWindowHandle)
+        {
+            HICON hDefaultIcon = LoadIcon(mhInstance, mIconResource);
+            HICON hSmallIcon   = LoadIcon(mhInstance, mIconSmallResource);
+            mWindowThread->post([=]()
+                {
+                    SendMessage(mWindowHandle, WM_SETICON, ICON_BIG, (LPARAM)hDefaultIcon);
+                    SendMessage(mWindowHandle, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon);
+
+                    SetClassLongPtr(mWindowHandle, GCLP_HICON, (LONG_PTR)hDefaultIcon);
+                    SetClassLongPtr(mWindowHandle, GCLP_HICONSM, (LONG_PTR)hSmallIcon);
+                });
+        }
+}
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 36e89e4586..0fc93ad0b1 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -70,6 +70,7 @@ public:
     /*virtual*/ bool setCursorPosition(LLCoordWindow position);
     /*virtual*/ bool getCursorPosition(LLCoordWindow *position);
     /*virtual*/ bool getCursorDelta(LLCoordCommon* delta);
+    /*virtual*/ bool isWrapMouse() const override { return !mAbsoluteCursorPosition; };
     /*virtual*/ void showCursor();
     /*virtual*/ void hideCursor();
     /*virtual*/ void showCursorFromMouseMove();
@@ -150,7 +151,7 @@ protected:
     virtual LLSD    getNativeKeyData();
 
     // Changes display resolution. Returns true if successful
-    bool    setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh);
+    bool    setDisplayResolution(S32 width, S32 height, S32 refresh);
 
     // Go back to last fullscreen display resolution.
     bool    setFullscreenResolution();
@@ -195,6 +196,7 @@ protected:
 
     HCURSOR     mCursor[ UI_CURSOR_COUNT ];  // Array of all mouse cursors
     LLCoordWindow mCursorPosition;  // mouse cursor position, should only be mutated on main thread
+    bool        mAbsoluteCursorPosition; // true if last position was received in absolute coordinates.
     LLMutex mRawMouseMutex;
     RAWINPUTDEVICE mRawMouse;
     LLCoordWindow mLastCursorPosition; // mouse cursor position from previous frame
@@ -214,6 +216,7 @@ protected:
     bool        mCustomGammaSet;
 
     LPWSTR      mIconResource;
+    LPWSTR      mIconSmallResource;
     bool        mInputProcessingPaused;
 
     // The following variables are for Language Text Input control.
@@ -246,6 +249,11 @@ protected:
     RECT mRect;
     RECT mClientRect;
 
+    void updateWindowTheme();
+    bool isSystemAppDarkMode();
+    void setCustomIcon();
+    bool mCurrentDarkMode { false };
+
     struct LLWindowWin32Thread;
     LLWindowWin32Thread* mWindowThread = nullptr;
     LLThreadSafeQueue<std::function<void()>> mFunctionQueue;
@@ -281,6 +289,7 @@ private:
 
 extern LLW32MsgCallback gAsyncMsgCallback;
 extern LPWSTR gIconResource;
+extern LPWSTR gIconSmallResource;
 
 S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 type);