Ansariel
|
1bbe697db7
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
|
2024-06-11 14:38:20 +02:00 |
|
Ansariel
|
ea5ead6f4a
|
Merge remote-tracking branch 'FS600/master'
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-23 18:15:07 +02: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 |
|
Ansariel
|
4a2790a987
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/app_settings/graphic_preset_controls.xml
|
2024-04-24 21:10:15 +02:00 |
|
Ansariel
|
b527620dfc
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-24 19:53:03 +02: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 |
|
Ansariel
|
7355b798d2
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/lltexturefetch.cpp
|
2024-04-12 19:33:20 +02: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 |
|
Ansariel
|
2474e3ba1d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 10:03:37 +02: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 |
|
Ansariel
|
096aef2a72
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-10 01:49:35 +02:00 |
|
Brad Linden
|
5a47a3cb23
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-09 14:17:34 -07:00 |
|
Ansariel
|
9f535a0e2d
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
|
2024-03-27 00:04:15 +01:00 |
|
Cosmic Linden
|
2ef42c8c36
|
viewer#1051: Credit Ansariel for this fix
|
2024-03-25 15:52:30 -07:00 |
|
Ansariel
|
ac898495ae
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
|
2024-03-04 22:38:34 +01: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 |
|
Ansariel
|
799c2c6dab
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/de/menu_viewer.xml
|
2024-03-02 00:42:18 +01:00 |
|
Ansariel
|
203ac04bf6
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/skins/default/xui/en/floater_stats.xml
|
2024-03-01 20:49:42 +01: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 |
|
Ansariel
|
80579b7574
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-599
# Conflicts:
# indra/newview/llchiclet.h
|
2024-02-05 23:32:19 +01: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 |
|
Ansariel
|
45dc1a63f0
|
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
|
2024-01-12 14:18:34 +01:00 |
|
Ansariel
|
709aaaf0b0
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
2024-01-09 11:58:47 +01:00 |
|
Ansariel
|
b9a2c8279f
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
2024-01-09 10:54:50 +01:00 |
|
Ansariel
|
0a292ab51d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
2024-01-09 10:21:07 +01:00 |
|
Ansariel
|
3bd76c0fea
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llfasttimerview.cpp
# indra/newview/skins/default/xui/en/widgets/color_swatch.xml
# indra/newview/skins/default/xui/en/widgets/texture_picker.xml
|
2024-01-09 09:37:38 +01: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 |
|
Ansariel
|
e341621a8e
|
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
|
2023-12-27 13:00:20 +01:00 |
|
Ansariel
|
b32cd27b4c
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# autobuild.xml
# indra/cmake/ViewerMiscLibs.cmake
# indra/llmath/llvolume.cpp
# 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
# indra/newview/llviewermenu.cpp
|
2023-12-18 19:25:49 +01:00 |
|
Ansariel
|
830c9ce388
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
|
2023-12-18 19:05:55 +01: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 |
|
Ansariel
|
6f49b2609e
|
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
|
2023-12-15 23:36:05 +01:00 |
|
Ansariel
|
783e488a63
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llspatialpartition.cpp
|
2023-12-15 22:48:56 +01: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 |
|
Ansariel
|
c06fa64758
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvosky.cpp
|
2023-12-01 13:10:11 +01:00 |
|
Ansariel
|
d26000bac7
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# 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/llpaneleditwearable.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
|
2023-12-01 12:39:13 +01:00 |
|
Ansariel
|
50c7296d34
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
|
2023-12-01 11:27:42 +01:00 |
|
Ansariel
|
f08bf0aa72
|
Merge branch 'DRTVWR-588-maint-W' of H:/ViewerDev/viewer-588
# Conflicts:
# indra/newview/llspatialpartition.cpp
# indra/newview/skins/default/xui/en/alert_icon.xml
# indra/newview/skins/default/xui/en/floater_associate_listing.xml
# indra/newview/skins/default/xui/en/floater_ban_duration.xml
# indra/newview/skins/default/xui/en/floater_experiences.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
# indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
# indra/newview/skins/default/xui/en/floater_mfa.xml
# indra/newview/skins/default/xui/en/floater_mute_object.xml
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_preview_animation.xml
# indra/newview/skins/default/xui/en/floater_script_search.xml
# indra/newview/skins/default/xui/en/floater_test_inspectors.xml
# indra/newview/skins/default/xui/en/floater_test_line_editor.xml
# indra/newview/skins/default/xui/en/floater_test_textbox.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/floater_web_content.xml
# indra/newview/skins/default/xui/en/menu_profile_overflow.xml
# indra/newview/skins/default/xui/en/menu_toolbars.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
# indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
# indra/newview/skins/default/xui/en/panel_edit_universal.xml
# indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/en/panel_navigation_bar.xml
# indra/newview/skins/default/xui/en/panel_performance_complexity.xml
# indra/newview/skins/default/xui/en/panel_performance_huds.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
# indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
# indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
# indra/newview/skins/default/xui/en/widgets/name_editor.xml
# indra/newview/skins/default/xui/en/widgets/notification_list_view.xml
# indra/newview/skins/default/xui/en/widgets/view_border.xml
|
2023-11-30 18:59:41 +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 |