summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/pl
AgeCommit message (Collapse)Author
2025-12-04Merge remote-tracking branch 'secondlife/release/2026.01' into 2026.01Erik Kundiman
2025-11-24#5035 Fix missed am/pm switchAndrey Kleshchev
2025-08-21Merge tag 'Second_Life_Release#143de1dd-2025.06' into 2025.06Erik Kundiman
2025-08-19Revert "Remove the first login screen (#4451)" (#4578)Signal Linden
* Revert "Remove the first login screen (#4451)" This reverts commit b82f52acbb00a9dd3e5426e8a6510a0ef6f41289. * Revert "#4451 Remove missed first login image" This reverts commit 8eb2429a16b7dee570a28578f3d75f2a423f20af.
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-08-06Merge branch develop into 2025.06Andrey Kleshchev
# Conflicts: # indra/newview/llvoavatar.cpp
2025-07-27Remove the first login screen (#4451)Kyler "Félix" Eastridge
* Remove panel_login_first.xml and it's components * Remove additional first login panel resources * Remove redundant comment * Remove *.jpg search from viewer manifest
2025-07-18Merge branch 'main' into 2025.05Erik Kundiman
2025-06-20Megapahit words on panel progress localisationsErik Kundiman
2025-06-19Bring back 3p logos to the viewer, mainly for FMODErik Kundiman
I checked out the related files from 45249de1ca418324c4077312eefc7edc7e22c401, before the merge with upstream logo removal, but then I had to reapply c2d491905b668702d5640c7c5472629f7acc27e0, the MotD dynamic resizing, and remove the unused commented out vivox-related part since we're not redistributing it.
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-09Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04Erik Kundiman
2025-05-05#4015 Restore formatting for strings.xml and teleport_strings.xml translationsAndrey Lihatskiy
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-18Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
2025-04-18Remove incorrectly calculated upload fee from snapshot options button based ↵Ansariel
on previously selected snapshot type and not necessarily snapshot to inventory
2025-04-15Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
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-15Merge pull request #3911 from secondlife/mainJonathan "Geenz" Goodman
Merge 2025.03 release into develop.
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-25Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattleRider Linden
Fix conflicts
2025-03-21Merge tag 'Second_Life_Release#895a6739-2025.03' into 2025.03Erik Kundiman
2025-03-06Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03Erik Kundiman
2025-03-05#2711 Remove ALM text from About SLMaxim Nikolenko
2025-02-28#3267 Fix parts of avatar's texture floater not being clickableAndrey Kleshchev
scroll_content_panel was too small and did not cover some of the pickers Panel's name wasn't unique, renamed to avoid confusion
2025-02-26Issue #2907: Process metadata sent along with chats of type ↵Rider Linden
IM_NOTHING_SPECIAL, The metadata can contain information about the bot status of the sender. It may also contain a system-injected notification that is displayed to the agent as part of the 1:1 chat window.
2025-01-20Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into ↵Erik Kundiman
2024.12-ForeverFPS
2025-01-15#3405 MotD dynamic resizingAndrey Kleshchev
2025-01-14#3398 Remove 3p logos from the viewerAndrey Kleshchev
2024-12-11Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-12-10#3251 Remove obsolete intel driver notification (#3252)Dave Parks
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-09-25Revert "viewer#2413 Remove obsolete alert about expiring voice morphs"Andrey Kleshchev
This reverts commit 5c16ae13758bdfe8fe1f13d5f67eabbb6eaa30a1. Fix is correct, but should wait untill server sided fix gets deployed.
2024-09-12Fix macOS locale not being set due to missing locale stringsRye Cogtail
2024-08-27viewer#2413 Remove obsolete alert about expiring voice morphsAndrey Kleshchev
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-17Merge remote-tracking branch 'origin/release/webrtc-voice' into ↵Brad Linden
release/2024.06-atlasaurus # Conflicts: # autobuild.xml # indra/newview/llvoicechannel.cpp
2024-06-27Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voiceErik Kundiman
2024-06-21Disable voice morphing and throw up a warning if it's previously enabled.Roxie Linden
2024-06-17#1773 Advanced Lighting Model info still showing in About for other languagesAlexander Gavriliuk
2024-06-11Merge tag '7.1.8-release'Erik Kundiman
source for viewer 7.1.8.9375512768
2024-06-11Merge branch 'main' into marchcat/c-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llviewermenufile.cpp
2024-05-27viewer#1218 Moon beacon can't be toggled when setting is no-modAndrey Kleshchev
Two moon_layout stacks, disabling content of external disabled whole internal stack, not just specific elements. Removed extra stack.
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
2024-05-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵RunitaiLinden
gltf-dev-maint-a-merge