Ansariel
|
a9b52b1f73
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llrender.cpp
# indra/llui/llbutton.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/llhudtext.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2024-09-04 11:17:13 +02:00 |
|
Cosmic Linden
|
e42e95d878
|
secondlife/viewer#2483: Fix label typo in PBR terrain texture transforms tab
|
2024-09-03 10:10:32 -07:00 |
|
Ansariel
|
04bed35215
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llwebrtc/llwebrtc.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
|
2024-08-02 13:01:06 +02:00 |
|
Andrey Kleshchev
|
daa240164d
|
Post pull request contribution doc update (#2077)
|
2024-08-02 13:02:36 +03:00 |
|
Ansariel
|
684bc1d1ea
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
|
2024-06-21 19:46:51 +02:00 |
|
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 |
|
Ansariel
|
b84b5bd949
|
Merge remote-tracking branch 'LL/release/materials_featurette'
# Conflicts:
# doc/contributions.txt
|
2024-05-16 02:52:21 +02:00 |
|
Ansariel
|
343aeeeb36
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-16 02:11:51 +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 |