summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2025-08-08Merge branch '2025.05' into 2025.06Erik Kundiman
2025-08-08Merge branch 'main' into 2025.06Erik Kundiman
2025-07-29Merge branch 'main' into 2025.05Erik Kundiman
2025-07-27Connect to Discord now through privacy tabErik Kundiman
Now the access token is saved the way passwords are saved, but without a username, so we can have some persistence without having to implement an OAuth2 backend server cause we would have to store those tokens there anyway still and that would even require more disclosure that the user token gets saved on a server, and it's just simpler to not go that way. Discord Social SDK doesn't have to have a helper for sending code to a custom server anyway, that we would have to have some asynchronous HTTP requestor ready. Show location check button gets enabled only when Discord integration is enabled, though it's not functioning yet.
2025-07-27Move Discord-related code to llappviewer.cppErik Kundiman
The doFrame is the one called over and over again, so running the Discord callbacks from there shouldn't have one extra function overhead, while running the Discord initialisation is only once so it's much more okay to have the extra function overhead there.
2025-07-18Merge branch 'main' into 2025.05Erik Kundiman
2025-07-18Merge branch 'main' into 2025.05Erik Kundiman
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-03Merge tag 'Second_Life_Project#900516a4-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-07-03Partial @detach=<y/n> command implementationErik Kundiman
Only greying out the detach option on the contextual menu popped up by right clicking the attachment in the 3D view/world, and not yet preventing detachment from the inventory/wearing panels.
2025-07-02#4315 Crash in GLTF uploaderAndrey Kleshchev
Properly handle importer's crashes in general
2025-06-30Minimal @sit=<y/n> command implementationErik Kundiman
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-11Fix tab vs whitespace lineKitty Barnett
2025-05-11Add the RLVa menuKitty Barnett
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
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-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-03-06Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03Erik Kundiman
2025-02-28#3280 Fix crashes at gFloaterToolsAndrey Kleshchev
Likely specific to headless client
2025-02-25#3591 More test coverage for crashesAndrey Kleshchev
2025-01-20Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into ↵Erik Kundiman
2024.12-ForeverFPS
2025-01-08#3349 keep object selection after showing confirmation dialogMaxim Nikolenko
2024-10-22Merge branch 'main' into 2024.09-ExtraFPSErik Kundiman
2024-10-21Firestorm's resync animations menu optiongwigz
2024-10-18Merge branch 'main' into 2024.09-ExtraFPSErik Kundiman
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-12Revert "Add toggles to avatar dropdown for hear sound or voice from avatar. ↵Andrey Lihatskiy
(#2518, #2519)" This reverts commit 6af471482d6801530915c1c9ae4bdf788af52eae.
2024-10-09Minimal favorite folder inventory featuregwigz
Utilizes the recent-ish "open in new window" functionality from `LLPanelMainInventory::newFolderWindow`
2024-10-07Port Firestorm/Catznip refresh attachments featuregwigz
2024-09-10Clean up llviewermenuAnsariel
2024-09-07Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-09-06Add toggles to avatar dropdown for hear sound or voice from avatar. (#2518, ↵TJ
#2519)
2024-09-04Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into developBrad Linden
2024-09-04Fix another 1856 crash on startup case when Terrain Bake shaders are ↵Brad Linden
unsupported (#2491) fixes secondlife/viewer#1856
2024-09-03#2403 Reset Skeleton issuesAlexander Gavriliuk
2024-09-01Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-08-29Add error handling for intel crashes from GLTF Scene shader (#2456)Brad Linden
fix secondlife/viewer#1856
2024-08-18Fix findChild frame drops when switching inventory panelsRye Mutt
2024-08-13Merge pull request #2210 from secondlife/v-1883cosmic-linden
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
2024-08-06secondlife/viewer#1883: Local-only PBR terrain paintmap with developer toolsCosmic Linden
2024-08-04Optimization and cleanup of various color finds during drawRye Mutt
2024-07-29#2100 BugSplat Crash #1497210: LLVOAvatar::updateImpostors()(10616)Alexander Gavriliuk
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-27Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-25Fix precommit whitespace failureRye Mutt
2024-07-25Fix accidental memory leak from gSLMMenuUpdaterRye Mutt
2024-07-25Fix findChild stutter during teleportsRye Mutt
2024-07-23Legacy search floatermobserveur
This commit adds the legacy search floater to megapahit
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-13 16:08:33 +0000