Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/skins/default/xui/en/notifications.xml
2024-09-05 21:10:32 +02:00 · 2024-09-05 21:10:32 +02:00 · 68c17705a7
parent eda6b27185 1f477be2ce
commit 68c17705a7
1 changed files with 0 additions and 3 deletions
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@ -1674,9 +1674,6 @@ const   S32   max_format  = (S32)num_formats - 1;
        close();
        return false;
    }
-	//LL_PROFILER_GPU_CONTEXT; <FS:Beq/> TODO(Beq) review this 
-
-    LL_PROFILER_GPU_CONTEXT

    // Disable vertical sync for swap
    toggleVSync(enable_vsync);