84c62de95b
#4209 Outfits should have an "Add to Favorites" option
2025-07-23 22:15:39 +03:00
b08ba3fa7b
Merge branch 'main' into marchcat/2505-merge
...
# 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-28 21:38:00 +03:00
32cd3a6088
#4071 Permit pasting links into outfits
...
Like it's permitted to drop them
2025-05-13 21:43:44 +03:00
6225eb8c86
#4060 Fix subfolders use through ctrl-v
2025-05-13 15:20:44 +03:00
e466414be4
#4055 Fix subfolder dragging
2025-05-13 15:20:44 +03:00
37134720bc
#3757 Smarter subfolders dragndrop
2025-05-08 18:46:33 +03:00
00d612f430
#3993 Fix missing 'add to favorites' option
2025-04-29 17:16:31 +03:00
7d36e7103e
#3757 Disable ability to create folders in individual outfits
...
This part needs a recheck
2025-04-15 21:39:50 +03:00
ae93198735
Merge branch 'main' into marchcat/maint-c-restore
...
# 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-15 19:31:20 +03:00
7dce74fcfb
#3757 Move for subfodlers
2025-04-11 12:36:48 +03:00
2371994a88
#3757 Menu for subfodlers in outfits p2
2025-04-11 12:36:48 +03:00
1bb8fb2795
#3757 Menu for subfodlers in outfits
2025-04-11 12:36:48 +03:00
b95b20a1be
#3757 Allow subfolders in "My Outfits"
2025-04-11 12:36:48 +03:00
dab8b9c623
#3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel in List view; update persistence of new settings
2025-04-11 00:33:13 +03:00
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
f04992676d
#3685 add test floater for new slapps
2025-03-19 00:50:18 +02:00
a925b178b0
triage#163 'Create folder from selected' misbehaves in marketplace
...
Marketplace deliberately doesn't allow creating folders and the "New
folder from selected" is a way of creating a new folder then moving
selected items inside, therefore shouldn't be allowed.
2025-03-11 03:13:10 +02:00
d8f3c242d4
viewer#1104 Crash at populateFoldersList
...
Ensure folder creation callbacks remain alive
# Conflicts:
# indra/newview/llfloatercreatelandmark.cpp
# indra/newview/llfloatercreatelandmark.h
2025-03-11 01:41:05 +02:00
046ec79d22
#3505 Make inventory run less content checks
2025-02-07 18:34:04 +02:00
df0634f0c4
#3505 Make checkFolderForContentsOfType cheaper
2025-02-07 18:34:04 +02:00
2b7b81fbdb
#459 Filters on object inventory
2024-09-08 00:11:56 +02:00
9f7dd01772
Clean up boost includes and remove compiler warning pragma for unreachable code in PCH ( #2361 )
2024-08-20 18:41:48 +03:00
baca6ae980
Fix nullptr crash in LLInvFVBridge::getClipboardEntries
2024-07-22 11:01:24 -04:00
3013424057
Fix rare shutdown crash in gCacheName
2024-07-21 20:10:21 -04:00
781cbae21b
viewer-private#251 Fixed state of folder creation in marketplace
2024-07-17 22:27:51 +03:00
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
fece367b9b
jira-archive-internal#63268 Several objects are worn on the same part
...
of the body by double-clicking on the object from the "Library" folder
SL-13411
2024-06-14 19:25:29 +03:00
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
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
9e45c1e506
Fix issues resulting from b42f9d836b
2024-06-09 16:17:03 +02:00
db3f7eafa0
viewer#1588 Upload directly to Specified Inventory Folder
2024-06-04 19:24:02 +03:00
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
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
069ea06848
Fix line endings
2024-05-22 20:57:56 +03:00
7bb5afc11e
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llcommon/llpredicate.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llinventorybridge.cpp
2024-05-22 19:08:15 +02:00
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
47985e5822
triage#59 Fix missed 'static' declarations
2024-05-22 15:39:53 +03:00
6f7e50e2b2
viewer#1425 Fix missed 'static' declarations
2024-05-22 12:45:54 +03:00
25b19eb6b8
viewer#1424 Proper links support for favorites
2024-05-17 22:22:45 +03:00
3066cce199
viewer#1300 Small menu adjustment
2024-05-17 17:24:17 +03:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02:00
1c170381ae
viewer#1300 Update Inventory Settings
2024-05-04 01:50:50 +03:00
db3e5afbfb
Viewer#1301 Implement Inventory Favorites Tab
2024-05-03 00:18:09 +03:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
645811c6ef
Viewer#1301 Implement Inventory Favorites Tab WIP
2024-05-01 03:20:30 +03:00
1e7dc04644
viewer#1300 'Star' favorites in inventory #4
2024-05-01 03:20:29 +03:00
2add3b4953
viewer#1300 'Star' favorites in inventory #3
2024-04-29 22:43:24 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
cea6eeeede
viewer#1300 'Star' favorites in inventory
...
image is WIP
2024-04-27 00:39:50 +03:00
384d694aba
viewer#1300 Inventory favorites context menu
2024-04-27 00:39:49 +03:00
Andrey Kleshchev