summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2025-07-18Merge branch 'main' into 2025.05Erik Kundiman
2025-07-16#4337 Full Screen debug setting on MacOS results in a black screenAndrey Kleshchev
2025-07-12Rich Presence support using Discord Social SDKErik Kundiman
Download DiscordSocialSdk-1.4.9649.zip https://discord.com/developers/applications/1393451183741599796/social-sdk/downloads to your ~/Downloads folder. Add -DUSE_DISCORD:BOOL=ON to your cmake line. The authorisation is triggered by selecting Help > Discord Social. It seems that the user will need to do this every time they want Rich Presence support on the viewer while using Discord. The Discord app is still set to be a public client in the OAuth2 tab, I'm going to try to make it work with the app set to be a confidential client, next. All Discord-related code are contained within one file, llstartup.cpp, and other classes access it through some opaque layer, static functions, otherwise we'd get these "duplicate symbol" linking errors.
2025-07-09#4296 Crash at renderMorphMasksAndrey Kleshchev
2025-07-03Merge tag 'Second_Life_Project#900516a4-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-07-02#4315 Crash in GLTF uploaderAndrey Kleshchev
Properly handle importer's crashes in general
2025-06-23Exclude _M_ARM64 from including media plugin headersErik Kundiman
until we are ready to enable media plugins on Windows ARM64.
2025-06-09Fix usleep implementation for WindowsErik Kundiman
https://stackoverflow.com/questions/5801813/c-usleep-is-obsolete-workarounds-for-windows-mingw
2025-06-08Windows x86-64 without SSE2 will be crashed tooErik Kundiman
2025-06-08Make sure Windows include CEF & Dullahan headersErik Kundiman
and minimise diff related to LibVLC headers.
2025-06-06Revert "Exclude Windows from referring to LibVLC headers"Erik Kundiman
This reverts commit f0de1898e0b6a3b9f1ee1bcc762ba334b78bbcc6.
2025-06-03Exclude Windows from referring to LibVLC headersErik Kundiman
for now, until we are ready to enable media plugins on Windows.
2025-06-03Simple usleep implementation for WindowsErik Kundiman
Just copying from this site and adjusting it for now: https://filipivianna.blogspot.com/2010/07/usleep-on-windows-win32.html
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-28Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-developJonathan "Geenz" Goodman
2025-05-22Merge branch 'main' into 2025.04Erik Kundiman
2025-05-11Add basic scaffolding to support reply commands and handle @versionXXX as an ↵Kitty Barnett
illustration
2025-05-11Minimal code needed to add RLVa with an on/off toggleKitty Barnett
2025-05-09Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04Erik Kundiman
2025-05-01#4001 Bump cache versionAndrey Kleshchev
2025-04-30Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' ↵Erik Kundiman
into 2025.04
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-18Reduce memory allocations pinging the mainloop timeoutAnsariel
2025-04-18#3758 add support for highlighted segmentsMnikolenko Productengine
2025-04-15Merge branch 'release/2025.04' into rye/forevermacJonathan "Geenz" Goodman
2025-04-15Merge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
2025-04-13#3900 Skip checking AFK status during startup statesAndrey Lihatskiy
2025-04-10Merge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2025-04-10Merge commit '7947ce3' into marchcat/maint-c/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2025-04-04#3876 sendLogoutRequest loggingAndrey Kleshchev
mac's crash logs seem to get mixed with normal logs, hope is this will help confirming the issue. Also needed for automated testing.
2025-04-01Merge branch 'release/2025.03' into release/2025.04Jonathan "Geenz" Goodman
2025-04-01Merge tag 'Second_Life_Release#e671cb54-2025.03' into 2025.03Erik Kundiman
2025-03-31#3044 Add option to hide L$ balance for Snapshots with Interface showingMaxim Nikolenko
2025-03-30#3795 Crash at getVolatileAPRPool()Andrey Kleshchev
2025-03-29Merge tag 'Second_Life_Release#6ac1d4f3-2025.03' into 2025.03Erik Kundiman
2025-03-27Use LLCachedControl in llviewerwindow and llappviewerAndrey Kleshchev
Getting from gSavedSettings is expensive to do so often
2025-03-22Merge tag 'Second_Life_Release#0ec9bfaa-2025.03' into 2025.03Erik Kundiman
2025-03-18#3644 Adjust throttle based of how busy buffer isAndrey Kleshchev
2025-03-11Merge branch 'release/2025.03' into rye/forevermacJonathan "Geenz" Goodman
2025-03-11Merge branch 'marchcat/maint-b-cherrypicks' into marchcat/2025.03-maint-bAndrey Lihatskiy
2025-03-11#1080 BugSplat Crash: LLAppViewer::initStrings() - show crash reasonAlexander Gavriliuk
2025-03-11viewer-private#217 Cef log was deleted too oftenAndrey Kleshchev
delete once per session, not once per instance # Conflicts: # indra/newview/llviewermedia.cpp
2025-03-06Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03Erik Kundiman
2025-03-06Merge commit '8c1f00eebc6863c39d0143aeb7e37c68459d454f' into 2025.03Erik Kundiman
2025-03-05#3644 Fix new logging of packet drops hitting performance #2Andrey Kleshchev
Misunderstood how mDroppedPackets worked, clear out what's not needed
2025-03-04#3644 Fix new logging of packet drops hitting performanceAndrey Kleshchev
2025-03-04#3591 rethrow should be mac specificAndrey Kleshchev
Jumped the gun a bit, since reportCrashToBugsplat is OS specific, restore rethrow for other systems.