Commit Graph

693 Commits (master)

Author SHA1 Message Date
Ansariel 5fdef7863e Merge branch 'release/2025.07' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/skins/default/xui/en/menu_inventory.xml
2025-09-16 18:33:02 +02:00
Maxim Nikolenko cf3352e6f2
#3957 Add indication to a folder's context menu that it is the default upload location 2025-09-12 15:54:21 +03:00
Ansariel 8d220e4973 Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llmeshrepository.cpp
#	indra/newview/viewer_manifest.py
2025-08-25 20:42:31 +02:00
Andrey Kleshchev a27acaf356 #4583 Crash on LLInventoryPanel::itemChanged 2025-08-20 22:32:42 +03:00
Andrey Kleshchev b96c7ec6e6 #4518 Dupplicates can appear in favorites
if parent and child gets added back to back
2025-08-19 00:04:57 +03:00
Ansariel 539959a7f8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llwearableitemslist.cpp
2025-08-06 18:47:44 +02:00
Andrey Kleshchev 329e71a7d9 #3969 Log time it takes to create inventory from cache 2025-07-28 11:48:53 +03:00
Ansariel f37e2785d5 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-27 12:54:37 +02:00
Andrey Kleshchev 5d4e2c91b8 #3969 Log time it takes to create inventory from cache 2025-07-25 03:12:25 +03:00
Ansariel 1513d97e55 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/skins/default/xui/en/floater_inventory_settings.xml
2025-05-23 12:44:50 +02:00
Andrey Kleshchev 14f5cd2ba2 #3924 Fix favorites inventory panel being stuck 2025-04-29 16:56:21 +03:00
Andrey Kleshchev e8b1e077e0 #3953 My Inventory folder appears in Favorites 2025-04-28 21:53:39 +03:00
Ansariel 4c355879cc Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewitem.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatermodelpreview.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llinventoryfilter.h
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpaneloutfitedit.cpp
#	indra/newview/llpaneloutfitsinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelpermissions.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llpanelwearing.h
#	indra/newview/llselectmgr.h
#	indra/newview/llskinningutil.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerattachmenu.cpp
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerinventory.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llwearableitemslist.cpp
#	indra/newview/skins/default/textures/textures.xml
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/floater_object_weights.xml
#	indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/en/menu_inventory.xml
#	indra/newview/skins/default/xui/en/menu_outfit_tab.xml
#	indra/newview/skins/default/xui/en/menu_wearing_tab.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/en/panel_outfits_list.xml
#	indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
#	indra/newview/skins/default/xui/en/panel_places.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
#	indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
#	indra/newview/skins/default/xui/en/sidepanel_appearance.xml
#	indra/newview/skins/default/xui/en/strings.xml
#	indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
#	indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
2025-04-16 17:49:47 +02:00
Andrey Kleshchev 3daf08696e #3374 Fix item reparenting moving containing folder 2025-04-11 00:32:29 +03:00
Andrey Kleshchev b1fa03e224 #3374 LLFolderViewFolder::updateHasFavorites 2025-04-11 00:32:15 +03:00
Andrey Kleshchev f9503bdf8c #3353 Fix favorited items not being readded on parent removal 2025-04-11 00:29:35 +03:00
Ansariel a510a1da00 Convert BOOL to bool
# Conflicts:
#	indra/newview/llagent.cpp
2025-04-10 23:54:36 +03:00
Andrey Kleshchev e66637ff33 Fix missing inventory unlock 2025-04-10 23:14:02 +03:00
Andrey Lihatskiy 5d7a5001b4 Merge commit '9e24b30' into marchcat/maint-c/restore
# 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-10 06:01:50 +03:00
Ansariel 5bf1f485f3 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
2025-02-13 21:24:29 +01:00
Maxim Nikolenko 0679cbdec8
viewer-private#394 Ensure correct item id is used on mac 2025-02-13 16:10:49 +02:00
Ansariel 7e7e19ee35 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorymodel.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/pipeline.cpp
2025-02-07 19:38:29 +01:00
Andrey Kleshchev 046ec79d22 #3505 Make inventory run less content checks 2025-02-07 18:34:04 +02:00
Ansariel f30e9c2057 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-09-26 21:15:01 +02:00
Beq f00ae9cd4e FIRE-34532 Fixed crash uploading snapshot with non-tabbed inventory view
Place a null guard around the check for a tabbed view, preventing crashes. Also, adjustments were made to try to ensure "Show in Main View" works a bit better when combined with a single folder view
2024-09-23 21:10:50 +01:00
Ansariel 64b6587eec Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
2024-09-09 19:48:04 +02:00
Alexander Gavriliuk 2b7b81fbdb #459 Filters on object inventory 2024-09-08 00:11:56 +02:00
Ansariel 450d02ad39 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/ISSUE_TEMPLATE/10-bug.yaml
#	indra/llui/lldockcontrol.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llviewereventrecorder.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgrouproles.cpp
#	indra/newview/llpanelland.cpp
#	indra/newview/llphysicsmotion.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltoolpie.cpp
#	indra/newview/llviewermenu.cpp
2024-07-25 20:47:57 +02:00
Alexander Gavriliuk 603f448393 #2095 Crash #1497728: LLInventorySingleFolderPanel::hasVisibleItems 2024-07-24 18:26:04 +02:00
Ansariel e17c906698 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/lldrawpoolterrain.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
2024-07-22 20:58:53 +02:00
Rye Mutt d609cbaf54 Fix nullptr crash in LLInventoryPanel::itemChanged 2024-07-22 10:59:59 -04:00
Ansariel 088cc2ea35 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llstatgraph.cpp
#	indra/llui/llvirtualtrackball.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaceprofile.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
Ansariel 9fdca96f8b Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
Andrey Kleshchev ac0f56668b
Merge pull request #1840 from secondlife/inventory_favorites
viewer#1300
viewer#1301
viewer#1424
viewer#1425
viewer#1619
viewer#1005
2024-06-27 18:57:02 +03:00
Ansariel 591c75ebaf Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmessage/llcorehttputil.cpp
#	indra/llrender/llgl.cpp
#	indra/newview/installers/darwin/apple-notarize.sh
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llfloater360capture.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
Andrey Kleshchev d1cf13f31e viewer#1673 Crash calling dirtyDescendantsFilter 2024-06-10 19:31:31 +03:00
Andrey Kleshchev 0dcc912cec Merge main into inventory_favorites
# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp
2024-06-10 19:25:02 +03:00
Andrey Kleshchev d9ae73ca9a viewer#1673 Crash calling dirtyDescendantsFilter 2024-06-10 19:10:14 +03:00
Ansariel a17fd2352a Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcharacter/llmotioncontroller.cpp
#	indra/llcrashlogger/llcrashlogger.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llmessage/llregionflags.h
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/llurlentry.cpp
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelteleporthistory.cpp
#	indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
Andrey Kleshchev db3f7eafa0 viewer#1588 Upload directly to Specified Inventory Folder 2024-06-04 19:24:02 +03:00
Ansariel b42f9d836b Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# 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-22 19:04:52 +02:00
Andrey Kleshchev 25b19eb6b8 viewer#1424 Proper links support for favorites 2024-05-17 22:22:45 +03:00
Ansariel 0ecfbc3de9 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llappearance/llwearable.cpp
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
#	indra/newview/llimpanel.cpp
#	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/llpaneleditwearable.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	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/llviewermenu.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
Andrey Kleshchev db3e5afbfb Viewer#1301 Implement Inventory Favorites Tab 2024-05-03 00:18:09 +03:00
Andrey Kleshchev bbadb8b390 Viewer#1301 Small cleanup
notecards do not need to store 'favorite' flag
2024-05-02 21:08:41 +03:00
Andrey Kleshchev fc5e5327bc Viewer#1301 Implement Inventory Favorites Tab WIP#2 2024-05-02 03:05:41 +03:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
Andrey Kleshchev 645811c6ef Viewer#1301 Implement Inventory Favorites Tab WIP 2024-05-01 03:20:30 +03:00