2bc4fb2bf0
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
f6208020f5
SL-18629 - use AISAPI for some paths of new category creation
2022-11-22 15:46:08 +00:00
f9b6380689
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-14 23:57:09 +02:00
5172f5d6d6
SL-14037 BugSplat Crash #646590 : Enqueue failed in AIS
2020-10-01 22:36:52 +03:00
fb670069b0
Merge branch 'rlva/development' (v2.2.3 + v2.3.0 - both WIP)
2020-06-12 12:51:11 +02:00
980d418311
[FIXED] CATZ-553: Give-to-#RLV with nested subfolders
2020-03-11 22:17:29 +01:00
05a7525195
Merged with default tip (Revision bd9afd419b6a)
...
--HG--
branch : Appearance-Misc
2017-10-21 13:18:34 +02:00
099d988fe2
Merge viewer-neko
2017-05-25 22:49:53 +02:00
5db0af5327
MAINT-7419 Workaround for some purge and trash issues, stuck descendants count
2017-05-22 20:24:45 +03:00
4503a28aee
Merged with RLVa fixes
2016-12-03 17:13:17 +01:00
7b6add8ae9
[FIXED] Reverting an outfit after wearing new attachments doesn't detach the extr attachments
...
-> an AIS fix went missing in one of the recent merges cause inventory callbacks to once again not use the inventory item UUID
-> see changeset 60b16f58b01b for the original fix
--HG--
branch : Appearance-Misc
2016-11-14 19:08:54 +01:00
26b1c020c8
MAINT-6403: Updated a couple comments and dropped a couple warning levels back down to DEBUG.
2016-05-24 13:03:36 -07:00
c7413e51b6
MAINT-6403: in the case of a version mismatch between the viewer's local accounting and the AIS reported. Override with the AIS version. simplify the appearance update code to account for new versioning. Fix spelling of descendant
2016-05-23 14:40:43 -07:00
5cdd709393
Merge Firestorm LGPL
2016-07-01 13:55:06 +02:00
d135ebcd12
Forgot to uncomment something and enforce AIS3 in Second Life
2016-05-31 14:37:44 +02:00
e3c4f5554a
FIRE-19486: Manually dropping in Rider's fix for avatar bakes often fail after coroutine merge
2016-06-17 08:55:03 +02:00
b3219e0f54
Ooooops, forgot to uncomment this...
2016-05-31 18:20:01 +02:00
732f199cef
Merge Firestorm LGPL
2016-05-18 22:00:02 +02:00
dc000055a2
Remove the actual filter part of Appearance-AISFilter since deprecated UDP simulator messages are going to be removed from the backend in near future
2016-05-18 16:13:05 +02:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
5d899512c8
Bring back AIS filter (Kitty said we totally need this because AIS is broken)
2016-04-03 01:55:21 +02:00
8fe42955e3
Appearance-SyncAttach: Re-add missing UUID parsing for the CreateInventory AIS command (hopefully...)
2016-04-02 18:31:58 +02:00
b268729469
Remove remainders of actual AIS filter functionality - we always allow all AIS operations and this will also help with future merges
2016-04-02 17:49:41 +02:00
a1681b7d6c
Re-implement FSUseAis3Api debug setting
2016-04-02 17:42:06 +02:00
a50faa943c
Merge.
2016-04-01 12:59:37 +02:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
b8c1976460
Merge
2016-03-17 13:14:21 -07:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
9efda8ac70
MAINT-5933 FIXED When a new library avatar folder is created in Clothing folder, folder rename is grayed out until relog
2015-12-07 18:54:52 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
cf835a80cd
Pref instance() over getInstance()
2015-09-18 16:36:49 -07:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
97236a42ca
MAINT-5507: Remove HTTPClient and related cruft.
2015-09-14 11:15:23 -07:00
02c3262ac8
MAINT-5574: Added default parameter for callbalk on AISAPI interface.
...
Better check on callback exsit in coroutine
Don't create AISAPI::completion_t if there is no call back passed.
2015-08-28 10:05:15 -07:00
96bb17f20b
Merge
2015-08-25 11:40:36 -07:00
248d61fe0e
MAINT-5500: Finish converting the AIS responders to the new coroutine model, Cleaned up dead an unused code.
...
MAINT-4952: Added COPY and MOVE methods to Core:Http adapter
2015-08-12 16:32:49 -07:00
96d04a050b
Added patchAndYield to httputil adapter
...
Converted All AISv3 commands (except copyLibrary) to coro model.
2015-07-30 16:13:56 -07:00
5b846a91cf
Merge Firestorm tip
2015-07-18 16:37:52 +02:00
6e9905881e
Merge with general/AIS/big bird appearance and RLVa fixes + general RLVa code sync madness
2015-07-18 03:51:33 +02:00
4156096f5f
- fixed : LLInventoryCallback::fire() is called with the NULL UUID when creating links using AIS
...
--HG--
branch : Appearance-Misc
2015-06-25 03:34:57 +02:00
e5a0222707
- fixed : orphaned COF links (=remote deleted but not local deleted) cannot be removed when AIS is enabled
...
-> partial fix for https://jira.secondlife.com/browse/BUG-9506
--HG--
branch : Appearance-Misc
2015-06-27 04:45:24 +02:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
7b45d6daab
Merged with Appearance-Misc AIS fixes
...
--HG--
branch : Appearance-Misc
2015-05-02 16:47:18 +02:00
4d1072a0a8
MAINT-4878 FIXED Outfits worn from library copy the subfolders too
2015-04-03 18:36:14 +03:00
803d21dc44
- fixed : AIS link creation and removal are much slower than legacy messages
...
-> selectively fall back to legacy messages until the problem is fixed on the back-end
-> use AIS for everything except CMD_ITEM_REMOVE and CMD_OBJ_LINK (singular)
-> 0xFFFF & ~(CMD_ITEM_REMOVE | CMD_OBJ_LINK) = 0xFEEF (65263)
--HG--
branch : Appearance-Misc
2015-03-01 23:07:52 +02:00
2e01b5cbda
We actually only need to check in AISCommand::isAPIAvailable()
2015-02-23 09:50:42 +01:00
Ansariel