summaryrefslogtreecommitdiff
path: root/indra/newview/lloutfitgallery.cpp
AgeCommit message (Collapse)Author
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-12-01SL-18648 Clean up unused mNonImmediateFilterPermMaskAndrey Kleshchev
2022-10-27DRTVWR-570 Mac build fix: unused variables cleanupAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-06-09SL-17532 Ability to pick inventory image as a profile imageAndrey Kleshchev
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-03SL-15272 Bugsplat crashes at condition wait()Andrey Kleshchev
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-06-01SL-15291 Outfit Gallery shows 3 items per row when only 2 can fitAndrey Kleshchev
2021-05-21SL-15272 Bugsplat crashes at condition wait()Andrey Kleshchev
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-24SL-12435 Crash on mRowPanels.back()Andrey Kleshchev
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-14SL-13930 Appearance sort order should be similar to Inventory sort orderMnikolenko Productengine
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-01-16SL-12569 - Fixed more places where texture upload cost was hardcoded in UIBrad Payne (Vir Linden)
2019-11-28SL-12366 FIXED Crash in LLOutfitGallery::refreshOutfit(LLUUID const&)maxim_productengine
2019-11-25SL-12358 Preview picker for outfits shouldn't have 'apply now'andreykproductengine
2019-11-20SL-10499 - handle package info from benefits serviceBrad Payne (Vir Linden)
2019-11-15SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵Brad Payne (Vir Linden)
Group-related costs and limits via benefits.
2019-11-14SL-10499, SL-10497 - use LLAgentBenefits infoBrad Payne (Vir Linden)
2018-09-26MergeRider Linden
2018-08-04LLStoreAssetCallback now a std::functionRider Linden
2018-07-27MAINT-8924 FIXED Outfit snapshot upload closes inventorymaxim_productengine
2018-06-12MAINT-8727 FIXED Saving snapshot will cause disconnect if you do not choose ↵maxim_productengine
path in File picker quickly
2018-01-29MAINT-8247 FIXED [maint-viewer] All Outfit images become unassigned if ↵maxim_productengine
remove an outfit while selecting new image
2017-09-15MAINT-7801 FIXED "Take a snapshot" fails to assign new snapshot for Outfit ↵Mnikolenko Productengine
if default folder for uploads was changed
2017-08-23MAINT-7737 Fixed memory leak in Outfit Galleryandreykproductengine
2017-08-14MAINT-7665 Outfit folders should be capable of accepting images for previewandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 19:58:38 +0000