summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.cpp
AgeCommit message (Collapse)Author
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-24Merge branch 'main' into marchcat/a-mergeAndrey Lihatskiy
# 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-06Port from JsonCPP to Boost.Json for json parsing and serializing (#1054)Rye Mutt
2023-11-17SL-20607 Version folder was not created when copying folders to marketplaceAndrey Kleshchev
2023-03-30Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-10SL-18629 Replacing UDP creation messages with callback based AISAndrey Kleshchev
2023-03-10SL-18629 WIP Replacing UDP creation messages with callback based AIS #2Andrey Kleshchev
findCategory and move_item_to_marketplacelistings
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-18SL-17834 MP window freezes when loading items from Inventory #2Andrey Kleshchev
2022-08-17SL-17834 MP window freezes when loading items from InventoryAndrey Kleshchev
1. Do not process all marketpalce changes at once, schedule them for later 2. Do not notifyObservers from notifyObservers
2022-04-18jsoncpp includepath should not include json/. jsoncpp includes a header ↵Nicky
"features.h" which has the same name as a glibc header, allowing this header to be found without any prefix will lead to head conflicts when there is a '#include "features.h"' As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-07SL-17171 Display Marketplace Error Messages only when trying to use MarketplaceAndrey Kleshchev
2021-05-15SL-14388 Listing status issuesAndrey Kleshchev
Log issue and try to recover
2019-11-12Downstream merge from lindenlab/viewer-servalAndreyL ProductEngine
2019-10-17SL-12121 FIXED Unable to delete folders from 'Marketplace listings'Mnikolenko Productengine
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2017-03-20MAINT-7117 Don't Show "Unknown error" in warning dialogMnikolenko Productengine
2016-06-22MAINT-6385: Ensure that VMM initialization only happens once after login and ↵Rider Linden
that it will only happen after the region caps have been received.
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-04-04merge with 4.0.3-releaseOz Linden
2016-03-16MAINT-5938 FIXED when Marketplace is down viewer errors 499 at each login ↵andreykproductengine
and teleport
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-07MAINT-5691: Browser was using deprecated outbox display type AND not ↵Rider Linden
correctly returning error body to application. LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result VMM alert boxes now use type="alertmodal" rather than "outbox"
2015-09-18Set consistent terminology for yield/wait -> suspend for coroutines.Rider Linden
2015-09-14MAINT-5507: Remove HTTPClient and related cruft.Rider Linden
2015-09-11Bit of cleanup around Translation and remove httpassetstorageRider Linden
2015-09-11MAINT-4952: Slight change to marketplace logging allow direct logging of ↵Rider Linden
LLSD and remove unused logging function.
2015-09-10MAINT-5575: Finished converting experience cache to singletonRider Linden
MAINT-4952: Coverted VMM to coroutines
2015-08-11MergeRider Linden
2015-07-10Backed out changeset bab1000e1b2d: restore 'selfless' changesNat Goodspeed
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden
2015-07-01MAINT-5351: Remove 'self' parameter from coroutine functions.Nat Goodspeed
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest builds clean, but the resulting viewer is as yet untested.
2015-06-10DD-393 : Rework association so that is_listed property is not overwritten ↵Merov Linden
before we get data from SLM
2015-06-10DD-416 : Added DAMA when version folder is empty and unlisted, accelerated ↵Merov Linden
some functions avoiding depth computation when we could, fixed cut case
2015-06-08DD-336, DD-359 : WIP : Introduced a reverse lookup table for version folder ↵Merov Linden
to listing folder to improve performance
2015-06-05Added a seek method to LLCore::Http for data rewind.Rider Linden
A couple of minor changes to merchant out box in hopes that the would fix the issues.
2015-06-01Marketplace vendor outbox. Incomplete conversion. Still issues with ↵Rider Linden
redirection.
2015-05-02DD-396 : Add decription check on the common 422 error on marketplace listingMerov Linden
2015-04-13DD-379 : a 404 on a Get /listing means that said listing is not in SLM, then ↵Merov Linden
delete it from the local store
2015-04-13DD-382 : Use default values on association when version folder is not uniqueMerov Linden
2015-04-13DD-388 : More resilient way of reacting to not evaluated stock count ↵Merov Linden
throughout marketplace handling
2015-04-10DD-381 : Avoid unecessary SLM updates, suppress some ↵Merov Linden
update_marketplace_category() that are picked by dirty bit setup
2015-04-09DD-382 : Activation state should be unchanged when reassigning listing idMerov Linden
2015-04-08DD-382 : Refactored the auto activate code in create and associate listing. ↵Merov Linden
Update count on hand in reassociate correctly.
2015-04-07DD-382 : Set count_on_hand correctly when creating or assigning a listingMerov Linden
2015-04-02DD-338 : Auto unlist when stock gets to 0 during stock folder manipulationMerov Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 00:13:15 +0000