Cosmic Linden
|
fa4e463ba8
|
secondlife/viewer#1744: Fix missing LSL constant INVENTORY_SETTING in keywords_lsl_default.xml
|
2024-06-13 09:11:40 -07:00 |
|
Andrey Lihatskiy
|
d9153532b8
|
Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
|
2024-05-15 12:51:21 +03:00 |
|
Brad Linden
|
86c0c1d553
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-24 09:55:34 -07:00 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Andrey Lihatskiy
|
eab5beb54c
|
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
2024-04-12 15:43:34 +03:00 |
|
Andrey Lihatskiy
|
84dfe55810
|
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 07:08:25 +03:00 |
|
Brad Linden
|
5a47a3cb23
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-09 14:17:34 -07:00 |
|
Cosmic Linden
|
2ef42c8c36
|
viewer#1051: Credit Ansariel for this fix
|
2024-03-25 15:52:30 -07:00 |
|
Andrey Lihatskiy
|
b68a05e7c3
|
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
|
2024-03-04 18:01:05 +02:00 |
|
Andrey Lihatskiy
|
faf69f407f
|
Merge branch 'main' into marchcat/yz-merge
# Conflicts:
# indra/newview/llinventorygallery.cpp
|
2024-03-01 18:02:48 +02:00 |
|
Andrey Lihatskiy
|
6d077c90a0
|
Merge branch 'main' into DRTVWR-588-maint-W
|
2024-03-01 17:30:06 +02:00 |
|
Andrey Lihatskiy
|
e3e1672ac4
|
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
# indra/newview/llchiclet.h
|
2024-02-05 22:04:40 +02:00 |
|
Andrey Kleshchev
|
e5ef481cd3
|
SL-20781 Follow up on boost to std replacement
|
2024-01-09 00:19:39 +02:00 |
|
Andrey Lihatskiy
|
7d4de08fa9
|
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/llmaterialeditor.cpp
|
2024-01-08 23:49:38 +02:00 |
|
Andrey Lihatskiy
|
fee385247e
|
Merge branch 'main' into DRTVWR-594-maint-Y
|
2024-01-08 23:16:14 +02:00 |
|
Andrey Lihatskiy
|
fe796dac71
|
Merge branch 'main' into DRTVWR-588-maint-W
|
2024-01-08 23:15:00 +02:00 |
|
Andrey Kleshchev
|
afe91b7eb6
|
Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
2024-01-08 21:33:06 +02:00 |
|
Andrey Lihatskiy
|
c87850ddab
|
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
|
2023-12-18 07:57:29 +02:00 |
|
Andrey Lihatskiy
|
aed6313d7c
|
Merge branch 'main' into DRTVWR-594-maint-Y
|
2023-12-18 06:33:57 +02:00 |
|
Andrey Lihatskiy
|
793bed7d06
|
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
|
2023-12-15 07:06:15 +02:00 |
|
Brad Linden
|
4c791e098d
|
Merge remote-tracking branch 'origin/main' into DRTVWR-596
|
2023-12-14 12:07:18 -08:00 |
|
Andrey Lihatskiy
|
4b98ae6e8a
|
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
# indra/newview/llspatialpartition.cpp
|
2023-12-14 02:47:44 +02:00 |
|
Cosmic Linden
|
88b228a94d
|
Credit Henri for HUD fix
|
2023-12-13 13:39:53 -08:00 |
|
Alexander Gavriliuk
|
c9cd5631e4
|
Merge branch 'main' into DRTVWR-489
|
2023-12-05 03:37:06 +01:00 |
|
Andrey Lihatskiy
|
c409236dac
|
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2023-11-30 18:09:29 +02:00 |
|
Andrey Lihatskiy
|
27dae1d967
|
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-11-30 13:30:27 +02:00 |
|
Andrey Lihatskiy
|
0465c761a4
|
Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
|
2023-11-30 12:28:26 +02: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 |
|
Andrey Kleshchev
|
1fae237c15
|
SL-20610 Crash when unticking animesh on an attachment
|
2023-11-22 00:38:02 +02:00 |
|
Andrey Lihatskiy
|
e1fc7679f2
|
DRTVWR-594 Update contributions.txt
|
2023-11-09 23:21:18 +02:00 |
|
Andrey Lihatskiy
|
1e47b78f17
|
SL-20524 Update contributions.txt
|
2023-10-24 19:14:26 +03:00 |
|
Andrey Lihatskiy
|
e78556be9a
|
SL-20442 Update contributions.txt: name fix
|
2023-10-19 01:38:55 +03:00 |
|
Andrey Lihatskiy
|
8e7a39cfc6
|
SL-20442 Update contributions.txt
|
2023-10-19 01:32:07 +03:00 |
|
Alexander Gavriliuk
|
e7f1466a7b
|
Merge branch main into DRTVWR-489
|
2023-10-08 14:01:05 +02: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
|
fa29f4f0b1
|
SL-20224 Update contributions
Fix builds using OpenAL
|
2023-08-29 20:44:27 +03:00 |
|
Andrey Kleshchev
|
7373fd91fa
|
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2023-08-24 01:23:52 +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 |
|
Andrey Lihatskiy
|
4a19e601ea
|
SL-20054 Update contributions.txt
|
2023-07-24 20:50:24 +03:00 |
|
Callum Prentice
|
c5d7f3c4c1
|
DRTVWR-489: trivial merge conflict fix
|
2023-07-18 10:51:51 -07:00 |
|
marchcat-pe
|
37f41392cd
|
Merge pull request #285 from secondlife/marchcat/SL-19669
INTL-490 Japanese Translation Update
|
2023-07-17 23:44:34 +03:00 |
|
Brad Linden
|
f975cfd736
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-07-17 13:37:03 -07:00 |
|
Andrey Kleshchev
|
acf82867b6
|
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
|
2023-07-17 23:34:59 +03:00 |
|
Andrey Lihatskiy
|
07ff9a5d67
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-17 23:17:29 +03:00 |
|
Andrey Lihatskiy
|
3790c9ed87
|
INTL-490 Japanese Translation Update
provided by Logue Takacs
|
2023-05-28 06:28:30 +03:00 |
|
Andrey Lihatskiy
|
53ed0ec70c
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# doc/contributions.txt
|
2023-05-17 23:57:11 +03:00 |
|
Callum Prentice
|
f45e888c90
|
Some small tweaks after merge with Viewer release
|
2023-05-17 11:31:45 -07:00 |