summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-10-17Merge pull request #2856 from secondlife/marchcat/c-developAndrey Lihatskiy
Develop → Maint C sync
2024-10-17Post-merge fix: "upload to folder" regressionAndrey Lihatskiy
2024-10-16Apply changes from 55f2103adc36db0d3f068a31a144e15465226e13 to ↵Ansariel Hiller
LLFolderViewItem::drawFavoriteIcon (#2867)
2024-10-16Merge pull request #2862 from Ansariel/marchcat/c-developAndrey Lihatskiy
Fix various merge issues
2024-10-15Fix more merge issues:Ansariel
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a * Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445
2024-10-15Add missing overridesAnsariel
2024-10-15Convert BOOL to boolAnsariel
2024-10-15Fix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors
2024-10-15Post-merge cleanup: llvoavatar.cppAndrey Lihatskiy
2024-10-15Post-merge cleanup: llwindowwin32.cppAndrey Lihatskiy
2024-10-15Fix missing inventory unlockAndrey Kleshchev
2024-10-15Post-merge fix: Restore initRootContent()Andrey Kleshchev
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 '7ae63daff1' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderviewmodel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp
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 '18f23d9a55' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llcontrolavatar.cpp # indra/newview/llinspecttexture.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.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-12#2408 The long covenant with emojis (no double requesting)Alexander Gavriliuk
2024-10-11Merge pull request #2839 from secondlife/rye/gha-matrix-configRye Mutt
Fix GHA matrix config linux build
2024-10-11Rework GHA matrix config to fix linux buildRye
2024-10-11viewer#2172 AM/PM selector #2Andrey Kleshchev
2024-10-11viewer#2172 Fix Unit TestAndrey Kleshchev
2024-10-11viewer#2172 AM/PM selectorAndrey Kleshchev
2024-10-11Merge pull request #2830 from secondlife/feature/rlvaVir Linden
Project: RLVa
2024-10-11Remove FLTK (#2832)AiraYumi
2024-10-10Implement the groundwork for wayland support. (#2803)Nicky Dasmijn
During compile time try to detect libwayland-client-dev is installed, - If yes, compile a viewer which can run and start under wayland. libwayland-client is needed to detect if the viewer is hidden/minimized. - if no, disable wayland support and refuse to start the viewer under wayland (xwayland is okay). To not introduce a hard link dependency on libwayland-client.so the object will be loaded dynamically if needed.
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-09#2696 The viewer crashes on gestures floater (fix navigation)Alexander Gavriliuk
2024-10-09viewer#2818 Creating a link to an empty notecard fails #2Andrey Kleshchev
2024-10-09viewer#2270 The "More" button does not close the "Choose emoji" floaterAndrey Kleshchev
2024-10-09Merge pull request #2824 from secondlife/marchcat/gha-macos-14Andrey Lihatskiy
Update GHA runner to macos-14
2024-10-08Follow-up test fixAndrey Lihatskiy
2024-10-08Use approximate equality for failing v3dmath test.Nat Goodspeed
Modernize lltut.h. Allow both F32 and F64 for ensure_approximately_equals() etc. Use std::string_view instead of const char* for message string to allow passing std::string as well. Use stringize() instead of explicit std::stringstream idiom.
2024-10-08Update GHA runner to macos-14Andrey Lihatskiy
due to the deprecation of macos-12 (actions/runner-images#10721)
2024-10-08viewer#2818 Creating a link to an empty notecard failsAndrey Kleshchev
AIS 'Cannot link to items with a NULL asset_id.'
2024-10-07Merge pull request #2820 from secondlife/leviathan/restore-JoystickAxisAndrew Meadows
restore old JoystickAxis name convention
2024-10-07restore old JoystickAxis name conventionleviathan
2024-10-07#2542 Buoyant Nametags (hide the name tag for deep underwater avatar)Alexander Gavriliuk
2024-10-05Merge pull request #2817 from Ansariel/develop-gamecontrol-prefsAndrew Meadows
Fix issues with game control preferences
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-05 Follow up for 39eb250 (#2815)Ansariel Hiller
2024-10-05More cleanup of LLMath and the color classes in particular (#2810)Ansariel Hiller
2024-10-04Fix mac link error using GL 4.3 functions (#2813)Brad Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 08:37:23 +0000