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
cef702d0c5
SL-13705 - bug fixes and comments
2020-08-14 14:11:34 +01:00
f28437adc7
SL-13705 - modified_strings.py handles more cases
2020-08-13 14:54:45 +01:00
1f9852f04c
SL-13705 - modified_strings.py added, for translation support
2020-08-12 18:27:00 +01:00
59de1d58d4
SL-13705 - modified-strings.sh added, for translation support
2020-08-11 14:14:38 +01:00
c1698dc041
SL-13000 - standard params for jellied male/female avs
2020-05-13 21:09:48 +01:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
29130c5483
SL-10093: Client code to support experiences changing an environment. Handle generic messages with "commands" to be executed.
2018-11-20 10:59:38 -08:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
a84ee929a5
merge
2018-09-27 19:54:10 +01:00
78866b33a9
Merge
2018-09-26 13:46:45 -07:00
e4e4ad3c09
SL-966 - animated object size/pos constraints cont, including some settings for debugging. additional options to anim_tool.py for making test animations
2018-09-10 20:13:35 +01:00
470e4b5afc
Merge in anim_tool.py refactoring from server-side script.
2018-08-09 18:49:25 -04:00
b50d546d5f
MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
...
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
e36745eb98
merge
2018-01-17 16:06:27 +00:00
Andrey Kleshchev