Commit Graph

127 Commits (0c39bdfd4de14a02104f3748030e974fbc98d978)

Author SHA1 Message Date
Andrey Kleshchev e466414be4 #4055 Fix subfolder dragging 2025-05-13 15:20:44 +03:00
Andrey Kleshchev 37134720bc #3757 Smarter subfolders dragndrop 2025-05-08 18:46:33 +03:00
Andrey Kleshchev 7d36e7103e #3757 Disable ability to create folders in individual outfits
This part needs a recheck
2025-04-15 21:39:50 +03:00
Andrey Kleshchev 7dce74fcfb #3757 Move for subfodlers 2025-04-11 12:36:48 +03:00
Andrey Kleshchev 2371994a88 #3757 Menu for subfodlers in outfits p2 2025-04-11 12:36:48 +03:00
Andrey Kleshchev 1bb8fb2795 #3757 Menu for subfodlers in outfits 2025-04-11 12:36:48 +03:00
Andrey Kleshchev b95b20a1be #3757 Allow subfolders in "My Outfits" 2025-04-11 12:36:48 +03:00
Alexander Gavriliuk 2b7b81fbdb #459 Filters on object inventory 2024-09-08 00:11:56 +02:00
Andrey Kleshchev ae0433f4eb Fix loose mGalleryPanel in LLInventoryGallery
LLInventoryGallery::buildGalleryPanel does the creation, not postBuild()
same for LLOutfitGallery. Either don't create mGalleryPanel or remove it
before creating again.
2024-08-15 22:56:42 +03:00
Rye Mutt c4e921828a Optimization and cleanup of various color finds during draw 2024-08-04 23:11:57 -04:00
Andrey Kleshchev 9e4cc30b29 viewer#2142 Crash at LLOutfitGalleryItem::setDefaultImage 2024-07-30 07:27:52 +03: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 Lihatskiy c95b4bf3ea Post-merge - trim trailing whitespace 2024-06-10 20:45:59 +03:00
Andrey Lihatskiy f74c10c4ec
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing 2024-06-10 20:03:54 +03:00
Ansariel 9e45c1e506 Fix issues resulting from b42f9d836b 2024-06-09 16:17:03 +02: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
Bennett Goble a0b3021bdc Trim trailing whitespace
Start trimming trailing whitespace, but limit the blast radius to a
handful of file types.
2024-05-29 08:10:00 -07: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 Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
Andrey Lihatskiy 428f21cf79 Merge branch 'main' into marchcat/x-merge 2024-04-24 18:45:54 +03:00
Ansariel eb1ed3896f Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
2024-03-12 16:52:30 +01:00
Andrey Lihatskiy b68a05e7c3 Merge branch 'main' into marchcat/x-merge
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
2024-03-04 18:01:05 +02:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Ansariel c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02:00
Andrey Lihatskiy e3e1672ac4 Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
#	indra/newview/llchiclet.h
2024-02-05 22:04:40 +02:00
Andrey Kleshchev 0d8bd79c79 SL-20750 MacOS Crash processing attributed string 2024-01-11 17:18:12 +02:00
AiraYumi 7c8907522f replace boost library to standard 2024-01-08 23:29:21 +02:00
Andrey Lihatskiy 1620205138 Merge branch 'main' into DRTVWR-600-maint-A 2023-12-18 06:35:51 +02:00
Andrey Lihatskiy aed6313d7c Merge branch 'main' into DRTVWR-594-maint-Y 2023-12-18 06:33:57 +02:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
Andrey Kleshchev 3b99af03ca SL-20672 Item and folder creation support
Moving everything manually doesn't seem like a right way, probably need
to make LLFolderView draw grids and then relace with LLInventoryPanel
2023-12-11 23:06:45 +02:00
Andrey Kleshchev 9f3edb90d4 SL-20181 Minor inventory fetching adjustements 2023-12-06 01:02:42 +02:00
Alexander Gavriliuk c9cd5631e4 Merge branch 'main' into DRTVWR-489 2023-12-05 03:37:06 +01:00
Andrey Lihatskiy 27dae1d967 Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llflatlistview.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
Andrey Kleshchev d2ade35b09 SL-20651 DragnDrop from library in gallery mode doesn't work 2023-11-28 15:11:52 +02:00
Alexander Gavriliuk 337b2fcc36 Mac build fix 2023-11-28 00:33:34 +01:00
Andrey Kleshchev f3b8565d21 SL-20411 Don't load all thumnails at once for large folders #2 2023-11-21 22:11:59 +02:00
Andrey Kleshchev aff01e2fd4 SL-20575 Fix some deletion issues
- Fixes 'cut' checks for gallery
- Checking if large folder is deletable should be faster now
- For large flat root folders eliminated delay of looking for cof

Might be a good idea to start cashing isItemRemovable if category
version hasn't changed.
2023-11-13 19:24:10 +02:00
Maxim Nikolenko bf740d67a6
SL-20576 FIXED Viewer crashes when clicking scroll bar after switching views 2023-11-09 22:08:39 +02:00
Brad Linden 3ecce24f9f Removed dead code after merge breaking the build 2023-10-25 16:57:18 -07:00
Brad Linden 673b3309dd Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-10-25 16:12:13 -07:00
Dave Parks 5c558a92c9 DRTVWR-559 Fix for mac build 2023-10-25 10:36:50 -05:00
Andrey Kleshchev e233e4fb50 SL-20232 Allow deletion of worn items #5 2023-10-17 21:28:08 +03:00
Andrey Kleshchev 7d82ee8075 SL-20232 Allow deletion of folders with worn content in gallery view #4 2023-10-17 21:26:39 +03:00
Andrey Kleshchev 813b0e7675 SL-20232 Allow deletion of worn items #2 2023-10-17 21:26:39 +03:00
Andrey Kleshchev a62f5bfac1 SL-20232 Allow deletion of worn items #1 2023-10-17 21:26:39 +03:00
Andrey Kleshchev 2968e8bea5 SL-20411 Don't load all thumnails at once for large folders #2 2023-10-09 19:45:09 +03:00
Andrey Lihatskiy 08a3b56669 SL-19826 Fix mac build issue (unused variable) 2023-10-05 20:22:28 +03:00
Nat Goodspeed 59cd3f48b0 SL-18837: Fix set-but-unreferenced in LLInventoryGallery::startDrag() 2023-10-04 14:19:44 -04:00