Brad Linden
|
4c791e098d
|
Merge remote-tracking branch 'origin/main' into DRTVWR-596
|
2023-12-14 12:07:18 -08:00 |
|
Andrey Lihatskiy
|
d1c0a5b840
|
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
2023-11-29 10:45:43 +02:00 |
|
Cosmic Linden
|
ee8b96f3ef
|
SL-20553: Clean up dead code
|
2023-11-09 13:54:42 -08:00 |
|
Andrey Lihatskiy
|
d4123ec30d
|
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# indra/newview/llinventorymodel.cpp
# indra/newview/llvovolume.cpp
|
2023-10-03 19:25:19 +03:00 |
|
Andrey Kleshchev
|
7d50a51434
|
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-10-03 19:00:33 +03:00 |
|
Andrey Kleshchev
|
1aa27d4d13
|
SL-20273 IM, Offer Teleport, Map and Pay SLurls from external browser were blocked
|
2023-09-07 23:06:00 +03:00 |
|
Andrey Kleshchev
|
3d73a10da3
|
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
|
2023-08-23 22:40:17 +03:00 |
|
Andrey Lihatskiy
|
d08859f3f4
|
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# autobuild.xml
|
2023-08-23 22:28:01 +03:00 |
|
Brad Linden
|
c6d5f11f63
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-08-23 12:26:14 -07:00 |
|
Cosmic Linden
|
57cc252fd6
|
SL-20024: Miscellaneous cleanup
|
2023-08-11 16:31:02 -07:00 |
|
Cosmic Linden
|
76c8cca936
|
SL-20024: Fix author attributions not transferring for saved object materials, fix item not renamed
|
2023-08-11 16:31:01 -07:00 |
|
Roxie Linden
|
c70f54095e
|
Fix some spacing
|
2023-07-14 10:34:39 -07:00 |
|
Roxie Linden
|
9a3c76757f
|
SL-20009 - race condition - calling cards could be created without name
This happens when a calling card is created before the name is in the
name cache.
|
2023-07-13 14:13:24 -07:00 |
|
Andrey Kleshchev
|
14eadadf99
|
SL-19857 Exception at category creation
|
2023-06-13 22:48:50 +03:00 |
|
Andrey Kleshchev
|
7f6ad82a2a
|
SL-19823 Additional logging
|
2023-06-12 23:53:10 +03:00 |
|
Andrey Kleshchev
|
0b16cd0da4
|
SL-19823 Edit not active for items
|
2023-06-07 00:13:59 +03:00 |
|
Andrey Kleshchev
|
03c263a1cd
|
SL-19533 Fix 'fetching' state timeout
|
2023-04-28 23:41:25 +03:00 |
|
Andrey Kleshchev
|
e7a1ac5db8
|
SL-19503 Deleting a thumbnail for folder does not remove thumbnail in viewer
|
2023-04-24 21:53:03 +03:00 |
|
Andrey Kleshchev
|
daca555592
|
SL-19609 Urls aren't dispatched according to the indicated grid
|
2023-04-19 20:06:37 +03:00 |
|
Maxim Nikolenko
|
ce2aaab159
|
SL-19604 FIXED Creating new folders and items in gallery or combination views does not highlight created item
|
2023-04-18 21:27:25 +03:00 |
|
Andrey Kleshchev
|
53f2e1710a
|
SL-19533 Faster declouding
|
2023-04-13 02:20:42 +03:00 |
|
Andrey Kleshchev
|
5e59ab0ab7
|
SL-19533 Further logging improvements
|
2023-04-12 00:39:48 +03:00 |
|
Andrey Kleshchev
|
6306b1fa6e
|
SL-19496 Thumbnail should be modifiable regardless of permissions
|
2023-03-31 22:07:19 +03:00 |
|
Andrey Kleshchev
|
ffc4f262b2
|
SL-18003 Improve dupplicate prevention #2
|
2023-03-28 23:00:33 +03:00 |
|
Andrey Kleshchev
|
3bf9c78f56
|
SL-18003 Improve dupplicate prevention
Try getting lost and found
|
2023-03-28 21:37:32 +03:00 |
|
Andrey Kleshchev
|
89a8c96f36
|
SL-18003 Bulk download items when possible
And signal fodler fetch completion when folder of recursive fetch is done, do not hold it for individual items
|
2023-03-28 02:27:34 +03:00 |
|
Andrey Kleshchev
|
0eff975649
|
SL-18003 Basic dupplicate prevention
|
2023-03-27 21:27:50 +03:00 |
|
Andrey Kleshchev
|
6fd7427c57
|
SL-18003 Bulk fetch some items by fetching whole folder
|
2023-03-26 13:44:50 +03:00 |
|
Andrey Kleshchev
|
9fa64f1e20
|
SL-18003 Fix items not being marked as complete when fetched via ais
|
2023-03-24 18:03:09 +02:00 |
|
Maxim Nikolenko
|
dfbf9e6d96
|
SL-19379 WIP update Add menu for Gallery view
|
2023-03-23 11:58:17 +02:00 |
|
Andrey Kleshchev
|
f98c1403fb
|
SL-18674 Reenable folder creation via AIS v3
Add item fetching via AIS v3
|
2023-03-18 01:15:27 +02:00 |
|
Andrey Kleshchev
|
70d99cde58
|
SL-18629 Track request depth to be able to distinguish incomplete folder reliably
|
2023-03-18 00:31:09 +02:00 |
|
Andrey Kleshchev
|
86c46a1229
|
SL-18674 Remove UDP fallbacks for AIS caps not present
|
2023-03-17 02:43:35 +02:00 |
|
Andrey Kleshchev
|
ac145cb21f
|
SL-18629 WIP Fetch Inventory using AIS caps
|
2023-03-15 20:18:38 +02:00 |
|
Andrey Kleshchev
|
da27311473
|
SL-18629 Creare items via AIS placeholder
|
2023-03-10 23:55:05 +02:00 |
|
Andrey Kleshchev
|
a777a0b27e
|
SL-18629 WIP Replacing UDP creation messages with callback based AIS
|
2023-03-10 19:32:47 +02:00 |
|
Andrey Kleshchev
|
cf901b5abb
|
SL-19282 Thumbnail adjustments
Follow links, fix outfts missing 'image' option, adjust inspector, recolor 'worn' in gallery
|
2023-03-02 01:46:46 +02:00 |
|
Brad Linden
|
5fabfa50d7
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-02-02 12:11:40 -08:00 |
|
Andrey Kleshchev
|
3d170fae5d
|
SL-18125 Separate GLTF permissions from normal uploads
|
2022-10-13 21:02:02 +03:00 |
|
Andrey Kleshchev
|
6f946b6b16
|
SL-18165 Tighten up some command permissions
|
2022-10-11 17:29:44 +03:00 |
|
Dave Parks
|
57805cac68
|
SL-17379 More complete integration of material asset type
|
2022-06-28 15:15:57 -05:00 |
|
Dave Parks
|
ad533fcd6b
|
SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.
|
2022-06-14 23:39:11 -05:00 |
|
Andrey Kleshchev
|
92af5af736
|
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
|
2020-11-11 23:34:37 +02:00 |
|
Andrey Kleshchev
|
46ebe69f32
|
SL-14303 Fix LLWearableType to not spam in logs
|
2020-11-10 18:18:51 +02:00 |
|
Mnikolenko Productengine
|
43941a3d87
|
SL-13669 tests should cover import/export category from llsd
|
2020-08-10 20:50:27 +03:00 |
|
Mnikolenko Productengine
|
357edecd9b
|
SL-13669 Change inventory cache to use a standard LLSD format
|
2020-08-04 15:30:20 +03:00 |
|
Dave Houlton
|
2a6b48c9b0
|
DRTVWR-440, merge in latest from 6.3.7 release
|
2020-01-28 17:26:45 -07:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
AndreyL ProductEngine
|
5f731d84cb
|
Downstream merge from 494-maint-wassail
|
2019-11-12 02:37:15 +02:00 |
|
AndreyL ProductEngine
|
c3bd256f33
|
Upstream merge from viewer-neko
|
2019-09-05 22:00:41 +03:00 |