0bfeb74172
Revert an accidental message template sha1 update.
...
DRTVWR-583
2023-10-16 08:48:00 -07:00
e841c73a99
Tons of masking changes and tweaks.
...
We now support masking mirrors in the GBuffer.
We also now support the concept of one arbitrary clip plane.
DRTVWR-583
2023-10-16 08:45:48 -07:00
e3e1d42ab3
SL-20229 update message template hash
2023-09-11 09:31:16 -05:00
455bbcf742
SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides
2023-08-29 16:42:55 -05:00
7d05ade3f1
SL-18330: Merge branch 'main' of secondlife/viewer into xcode-14.3
2023-06-01 09:56:41 -04:00
ed92f1d803
SL-18330: Consistently use new standalone Python llsd package.
2023-05-31 16:34:04 -04:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
b5688b8b20
Update default URL for message template in template_verifier.py as well
2022-11-21 21:15:01 +01:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
b3bfe05494
SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.
...
# Conflicts:
# scripts/content_tools/anim_tool.py
2022-05-18 23:31:08 +03:00
307db06310
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
cca7e12e1b
Bring packages formater step on par with 3p installation:
...
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
2022-04-07 02:35:47 +02:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
719702a95a
Fix template verifier erroneously failing checksum check
2022-02-02 12:16:51 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
3209ad92d6
DRTVWR-530 Mac buildfix: changed the license to opensource
2021-11-16 03:36:33 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
a42b5d6809
SL-15999 - made cwd handling a bit more robust in perfbot_run.py
2021-10-22 18:49:54 +01:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
910daee888
SL-15999 - perfbot allow --num to default to number of creds
2021-10-21 14:31:03 +01:00
23ec0fb50c
SL-16124 - switch default region to Lag Me 5 now that it is set up and working
2021-10-01 15:22:22 -07:00
b3382719ad
SL-16124 First pass at a Python3 script to launch multiple non-interactive Viewers with differing command line options
2021-10-01 12:33:37 -07:00
69fd209c83
SL-13313 Updated message_template.msg.sha1
2021-08-31 22:27:45 +03:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
fde4bd2cbc
SL-15177 Add slp-csv converting script
2021-05-12 15:07:17 +03:00
d2f76612a7
SL-15031 - more viewerstats.py support for cleaning up unused settings
2021-04-07 19:48:27 +01:00
704aeb09d8
SL-15031 - option to remove unreferenced settings
2021-04-06 16:32:19 +01:00
6c1dc74b75
SL-15031 - include settings_per_account stats
2021-04-01 15:55:57 +01:00
2e255caae1
SL-15031 - ViewerStats analysis compare to settings.xml
2021-03-30 16:59:17 +01:00
e0b4149215
SL-15031 - chmod flag
2021-03-26 14:43:05 +01:00
61ab982120
SL-15031 - ViewerStats analysis script
2021-03-26 14:42:40 +01:00
57c560fa0e
Merge branch 'master' into DRTVWR-521-maint
2021-02-17 21:23:31 +02:00
7cd921d97b
SL-13313 Update links to master message_template.msg
2021-01-15 14:33:23 +02:00
71ba69e82a
SL-13313 Support RegionInfo5 block in RegionInfo message, and add log message
2021-01-12 16:22:17 +02:00
e3de5de3c1
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2020-11-13 13:59:36 +00:00
bf72ffd84b
SL-13705 - added --deleted option to collect info on no-longer-needed text in translated files. Processing needs to be automated as the list is unfeasibly long.
2020-09-18 16:22:54 +01:00
f20b29dcb7
SL-13705 - language list defaults to the standard supported set of FR, ES, IT, PT, JA, DE. '--lang all' will also use this list
2020-09-16 12:51:59 +01:00
713d896d36
SL-13705 - added metadata tab to translation spreadsheet, showing invocation info
2020-09-15 15:49:26 +01:00
a74b366d22
SL-13705 - single output file with one tab per translation language
2020-09-15 13:53:39 +01:00
a1d24974e8
SL-13705 - lock all columns except C in the excel file (apparently google sheets does not respect this setting on import)
2020-09-14 20:34:51 +01:00
822a4fb7d2
SL-13705 - Additional cell/column properties specified in excel output
2020-09-11 21:47:37 +01:00
1eaa76f2f0
SL-13705 - quieter output
2020-09-11 19:37:04 +01:00
3788fdbb03
SL-13705 - fixes and spreadsheet format changes
2020-09-10 19:53:13 +01:00
932f66929d
SL-13705 - support multiple or all languages. more logic for excluding irrelevant fields
2020-09-10 18:58:41 +01:00
Jonathan "Geenz" Goodman