summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2024-10-13Merge branch 'release/maint-c' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerparceloverlay.cpp
2024-10-13Merge commit 'f32a6d40aa' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llvovolume.h
2024-10-12Merge commit 'bd9add8fc7' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llmodaldialog.cpp # indra/newview/llfloatermyenvironment.cpp # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llselectmgr.cpp # indra/newview/tests/llviewerassetstats_test.cpp
2024-10-12Merge commit '25b19eb6b8' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llwearableitemslist.cpp
2024-10-12Merge commit '738cf84c34' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelwearing.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llwearableitemslist.cpp
2024-10-12Merge commit 'a0b0f20777' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp
2024-10-12Merge commit '79b560dcfb' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermyenvironment.cpp # indra/newview/llhudobject.cpp # indra/newview/llhudobject.h # indra/newview/llviewermenu.cpp
2024-10-12Merge commit '15908fd34e' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/newview/llappviewer.cpp # indra/newview/llconversationlog.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llimview.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewerwindow.cpp # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
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-11viewer#2172 AM/PM selector #2Andrey Kleshchev
2024-10-11viewer#2172 AM/PM selectorAndrey Kleshchev
2024-10-10Merge branch 'rlva/base' into feature/rlvaAndrey Lihatskiy
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml
2024-10-10viewer#2818 Creating a link to an empty notecard fails #3Andrey Kleshchev
2024-10-07restore old JoystickAxis name conventionleviathan
2024-10-05Fix issues with game control preferences:Ansariel
* Add missing names for controls to make content localizable * Fix labels for controls that are obviously wrong/make no sense
2024-10-03even more correct GameControl feature-flag switchleviathan
2024-10-03more correct AgentUpdate transmission logicleviathan
2024-10-03add enable_game_control checkbox to GameControl prefsleviathan
2024-10-03put GameControl behind a feature flagleviathan
2024-10-03Add GameControl UI for per device settingsAlexander Gavriliuk
2024-10-03more GameControl prefs UIleviathan
2024-10-03avatar_motion-->GameControl translation and flycamLeviathan Linden
2024-10-03add GameControl feature and SDL2 dependencyLeviathan Linden
2024-10-02Merge branch 'develop' into rlva/baseKitty Barnett
2024-10-01Merge remote-tracking branch 'origin/release/2024.09-ExtraFPS' into developBrad Linden
2024-10-01#2519 Move "MediaSoundsEarLocation" and "VoiceEarLocation" toggles to the ↵Andrey Lihatskiy
Communicate menu (#2707)
2024-09-30Merge branch 'develop' into rlva/baseKitty Barnett
2024-09-30#2410 Combat 2.0 settings not reflected on heart iconAlexander Gavriliuk
2024-09-27Remove dead LLPostProcess class and related codeRye Cogtail
2024-09-27#2711 Remove ALM text from About SLMaxim Nikolenko
2024-09-26#2411 Disable LLFontVertexBuffer for HUDAndrey Kleshchev
It needs a rework
2024-09-26#2519 Move "MediaSoundsEarLocation" and "VoiceEarLocation" toggles to the ↵Andrey Lihatskiy
Communicate menu (#2707)
2024-09-26#2411 Allow disabling and enabling LLFontVertexBufferAndrey Kleshchev
for testing purposes
2024-09-26Force snapshot update when opening a snapshot panel and the resolution is ↵Ansariel
"Current Window" to determine correct image size and upload cost
2024-09-25Remove incorrectly calculated upload fee from snapshot options button based ↵Ansariel
on previously selected snapshot type and not necessarily snapshot to inventory
2024-09-25Fix upload cost calculation for snapshots to inventory based on encoded ↵Ansariel
image size and display upload cost to user
2024-09-25#2650 Add UI controls for debug settings: RenderTonemapMix RenderTonemapTypeMaxim Nikolenko
2024-09-25viewer#2413 Add 'ignore' checkbox to expiring voice morphsAndrey Kleshchev
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-23Merge remote branch 'develop' into release/luau-scripting for Maint BNat Goodspeed
2024-09-23Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
# Conflicts: # indra/newview/llfeaturemanager.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvoicewebrtc.cpp
2024-09-23Merge remote branch 'develop'into release/luau-scriptingNat Goodspeed
2024-09-22#2618 Roles and Members tab is a messAlexander Gavriliuk
2024-09-21#2618 Roles and Members tab is a mess (fix XML indents for readability)Alexander Gavriliuk
2024-09-20Restore option to change location of existing pick (#2622)Ansariel Hiller
2024-09-19Merge branch 'main' into marchcat/b-main-syncAndrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2024-09-18Tiny argument names correction (tittle -> title) (#2594)Pantera Północy
2024-09-17Merge branch 'develop' into rlva/baseKitty Barnett
2024-09-16Don't compose emojis on the RLVa console inputKitty Barnett
2024-09-16Add the RLVa menuKitty Barnett
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 08:59:26 +0000