Commit Graph

16 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Ansariel 2180c2a443 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorymodelbackgroundfetch.h
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-03-20 18:15:38 +01: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 f7bd33161b Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 11:05:22 +01:00
Andrey Kleshchev 46ebe69f32 SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02:00
Ansariel 496730fcf3 Stop complaining, GCC... 2020-11-05 22:22:04 +01:00
Ansariel 506449d367 Link replace: Add a hardcoded limit of 250 active AIS coros at a time to prevent exceeding coroutine pool limit 2020-11-05 09:07:27 +01:00
Ansariel e02e251003 Print link replace settings to log 2020-11-05 08:46:45 +01:00
Ansariel bbc1d60d93 FIRE-29942: Fix delete links operation in Replace Links floater spamming the AIS coprocedure pool 2020-08-04 20:46:14 +02:00
Ansariel c62ef0981b Merge viewer-neko 2019-09-06 19:58:23 +02:00
maxim_productengine e13a1ccdaa SL-11217 Show confirmation when replacing skin,shape,eyes or hairbase with item which doesn't match the type. 2019-09-04 17:39:26 +03:00
Ansariel 543e6bd097 FIRE-17695: Presumed fix for being unable to drag replacement target into link replace floater on Mac/Linux
The actual cause appears to be the uninitialized variable mDeleteOnly, default to true under certain circumstances.
Also remove the unreachable code in LLFloaterLinkReplace::onTargetItemDrop() - this code will never be reached because
the method is only invoked when actually performing a drop, but in the delete case, the target item textbox
is neither visible nor enabled, so a drop can't be done at all.
2019-01-12 16:38:32 +01:00
Ansariel 5c600e4627 FIRE-17695: Reduce impact of changes, minor fixes and German translation 2018-12-28 19:51:32 +01:00
Beq 7fa791280a FIRE-17695 - Bulk delete links capability 2018-12-28 17:58:23 +00:00
Mnikolenko Productengine 5478f2a223 MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress 2017-07-11 14:54:29 +03:00
andreykproductengine 1c5bdf4bdc MAINT-6519 MAC build fix 2017-05-05 20:18:52 +03:00
Ansariel b59ac959fc MAINT-6519 Contribution, adds feature to replace inventory links 2017-04-27 19:19:11 +02:00