summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-20SL-18353 Don't allow "Ungroup folder items" on outfit foldersAndrey Lihatskiy
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-10SL-18117 Smarter add and detach inventory menusAndrey Kleshchev
The 'exceptions' solution is a bit ugly, but alternative is remaking all inventory and chat menus to act based on registars
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
2022-08-04Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-07-29DRTVWR-559: Revert "Revert "Fix minor Mac build issues.""Nat Goodspeed
Try to reapply the original commit in such a way that it can be pushed. This reverts commit eaebe8fe70985f6d25cf883867f19617164ead81.
2022-07-29DRTVWR-559: Revert "Fix minor Mac build issues."Nat Goodspeed
Somehow this commit got into my local repository without showing up as a new commit relative to bitbucket. Try double-reverting it. This is the first one. This reverts commit 7772b5639a9bae2c4fbbcd2575355404c4bdca55.
2022-07-15SL-17741 Fixed wrong conditionAndrey Kleshchev
2022-07-14DRTVWR-559 fix mac build againBrad Kittenbrink
2022-07-09SL-17741 Paste is not disabled when copying 'no copy' itemsAndrey Kleshchev
We should allow to copy 'no copy' items for the ability to paste them as links, but regular 'paste' should be disabled in such case Also fixed library items enabling 'paste as link', we can not link library items.
2022-07-04SL-17665 Add operation to create a subfolder from selected items in InventoryMnikolenko Productengine
2022-06-29SL-17685 Drag and drop material support WIPDave Parks
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-27Continuing progress on SL-17602 inventory support for Materials. now have ↵Brad Kittenbrink
working inventory bridge implementations
2022-06-27SL-17623 Revise right-click menu on inventory foldersMnikolenko Productengine
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-05-25SL-17458 Cut works the same way as Copy when pasting into FavoritesAndrey Kleshchev
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-23SL-16904 FIXED The viewer crashes after trying to empty trash containing ↵Mnikolenko Productengine
calling card
2022-01-18SL-16639 Fixed Marketplace folder depth limit not working in some casesAndrey Kleshchev
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-10-20SL-16184 FIXED Frame stall when friend comes online.Mnikolenko Productengine
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 branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-02SL-14075 allow exporting multiple textures with the same nameMnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-21Revert "SL-14633 FIXED The item from the favorite tab in the inventory ↵Mnikolenko Productengine
floater can be purged"
2021-04-16SL-13395 Allow creating outfit folders under My OutfitsAndrey Kleshchev
2021-04-03SL-13182 Fix excessive resorting #2Andrey Kleshchev
Don't resort whole branch of inventory if created(loaded) item is not newer. Should also stabilize fetch phase a bit.
2021-04-01SL-13182 Split buildNewViews over framesAndrey Kleshchev
2021-02-25SL-14654 [EEP] Aplying settings locally now is instantAndrey Kleshchev
The 1 second fade makes it harder to compare different settings.
2021-02-23SL-12475 Add the way to reset current Favorites foldersMnikolenko Productengine
2021-02-19SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5Andrey Kleshchev
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-01-06SL-14633 FIXED The item from the favorite tab in the inventory floater can ↵Mnikolenko Productengine
be purged
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 07:24:28 +0000