Commit Graph

40 Commits (d8cbc8a0fd19027e243402da09aa0c6c5ee5483b)

Author SHA1 Message Date
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 Lihatskiy 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
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
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 Kleshchev 38fbe5267b SL-20181 Optimize marketplace fetch request
- Move it to the back unless requested by floater
(prioritize main inventory)
- Instead of fetching whole folder which likely has pending changes
from web side, fetch folder individually, then fetch changed content
in bulk
2023-12-06 01:02:42 +02:00
Andrey Kleshchev 811da7dbb1 SL-18629 WIP Replacing UDP creation messages with callback based AIS #2
findCategory and move_item_to_marketplacelistings
2023-03-10 19:32:47 +02:00
Ansariel c5a3c97b6b Add multi item properties floater support 2023-02-14 00:40:01 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Merov Linden 7816dfd5ac DD-403: Make the sort order persistent in marketplace listings floater 2015-05-15 20:10:45 -07:00
Merov Linden 36ce6fbda5 DD-403 : Add sort by name and by most recent 2015-05-06 23:47:44 -07:00
Merov Linden 626d465894 DD-321 : Fix the drop zone to react really on the drop zone 2015-01-31 20:47:40 -08:00
Merov Linden a62b1a26f5 DD-301 : Add show only listing folders as an optional filter 2015-01-24 20:56:24 -08:00
Merov Linden 6cf5912fd0 DD-306 : Suppress no issue listings from audit listing dump, add no error message when no error, disable some right click menu items in multiselection cases 2015-01-24 16:50:56 -08:00
Merov Linden 96172ddfe6 DD-306 : WIP : Add Check Listing to menu to audit listings individually 2015-01-24 11:48:43 -08:00
Merov Linden 8cb399e3e5 DD-300 : Drop zone added to marketplace folder 2015-01-19 20:50:47 -08:00
Merov Linden 9177aea590 DD-289 : Fix crash when dropping first item in marketplace listings 2014-12-09 06:59:01 -08:00
Merov Linden 4fd175bc31 DD-289 : WIP : Prevent building tabs twice 2014-12-04 22:45:04 -08:00
Merov Linden d1d58fbf25 DD-287 : Use the current tab correctly when creating a new folder. Fixed the sorting to be applied to all tabs as intended. 2014-11-23 20:47:56 -08:00
Merov Linden b5e557b137 DD-258 : Disable the Check for Errors buttons (aka Audit) while the inventory is still fetching 2014-11-08 12:33:57 -08:00
Merov Linden 9fd904220b DD-195 : Add text filtering to the marketplace listings floater 2014-09-07 22:54:50 -07:00
Merov Linden 634d495734 DD-106 : Unlist and deactivate old listing when reassociating a listing id 2014-08-27 23:12:06 -07:00
Merov Linden 906927a99f DD-112 : Disable the add folder button if the tab doesn't support drop on root 2014-08-14 23:05:01 -07:00
Merov Linden 231572cfed DD-100 : Fixed! Had to create the inventory panels after we get the marketplace listings root id 2014-08-09 20:34:55 -07:00
Merov Linden 51e4ad0ed0 DD-101 : Do not list or associate listings that do not validate. Present user with relevant error when that happens. 2014-07-26 14:44:04 -07:00
Merov Linden fc4939033e DD-22 : WIP : Fix initialization glitch and got rid of old Merchant Outbox remnants in Marketplace 2014-04-28 14:11:17 -07:00
Merov Linden 370620c56b DD-19 : Revalidate the marketplace when reopening the Audit floater 2014-04-23 18:19:11 -07:00
Merov Linden 59f512b375 DD-19 : Cleaned up Marketplace Audit UI, make the floater non modal 2014-04-23 18:00:34 -07:00
Merov Linden cda6ac9e9b DD-71 : Implement a new item properties floater, calls the same code as the sidepanel in the inventory but with the back button hidden 2014-04-21 15:26:14 -07:00
Merov Linden e4863cf7f6 DD-19 : Implement preliminary audit / validation display 2014-04-20 20:32:17 -07:00
Merov Linden e207c89c53 DD-19 : WIP : Add marketplace validation modal dialog to view the log (no validation text yet) 2014-04-18 18:44:43 -07:00
Merov Linden a99e247544 DD-58 : Implement associate listing UI and primitive 2014-04-18 14:41:32 -07:00
Merov Linden 18da8170a7 DD-54 : WIP : Improved validation to wrap items and stock items within version folders if necessary. Also hooked up the audit button with the validation code though all printout happens in the log 2014-04-17 16:49:28 -07:00
Merov Linden 22c8ed2f80 DD-64 : Add New Folder to right click menu on marketplace 2014-04-12 17:37:50 -07:00
Merov Linden 2a031df763 DD-12, DD-19 : Add a button to create a new listing folder. Also added a validate button though it does nothing ATM 2014-04-11 11:55:57 -07:00
Merov Linden 1a03f7f605 DD-40 : A bit more on marketplace listings refactoring and code cleaning (and clearing) 2014-03-26 17:15:27 -07:00
Merov Linden 48b6a713be DD-10 : Make the filter tool works in All tab and finished refactor 2014-03-26 10:55:42 -07:00
Merov Linden a65ea2f5a0 DD-40 : WIP : Refactor marketplace listings UI classes in their own cpp / h files 2014-03-25 13:41:40 -07:00