diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-12 04:37:42 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-12 04:37:42 +0200 |
| commit | f9866a3543e1e13404891c949a3ceca482d2f649 (patch) | |
| tree | 34e170a4bbe0c9c60832821fdf3246c883b6cf53 /indra/llmessage/llxfer_vfile.cpp | |
| parent | a66ea0a9089f9525a9e92ae3e7ebed412ffd53e1 (diff) | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
Merge branch 'main' into DRTVWR-573-maint-R
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
Diffstat (limited to 'indra/llmessage/llxfer_vfile.cpp')
0 files changed, 0 insertions, 0 deletions