b388191062
DRTVWR-521 post-merge build fix
2021-07-20 03:02:05 +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
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
a6ea2dbedc
SL-15292 Voice's singleton shutdown before voice's coroutine
2021-07-19 23:38:31 +03:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
54171dbc9f
SL-15585 more logging for altool
2021-07-19 18:58:04 +03:00
2d855a9fd7
SL-15594 Reimplement previous voice keybind behavior
...
Also fixed dupplicate checks
2021-07-16 22:59:08 +03:00
3bdabd80de
DRTVWR-521 improvement
2021-07-15 19:36:43 +03:00
09f53a672b
SL-443 keybindings: Do not error on unknown function
...
It is likely be from newer viewer / Preparations for SL-443 deloyment.
2021-07-15 18:47:07 +03:00
be6066eae2
Increment viewer version to 6.4.22
...
following promotion of DRTVWR-516
2021-07-14 23:27:32 -04:00
11635dc5b8
SL-15585 typo fix
2021-07-15 00:58:07 +03:00
b58fb17582
SL-15585 Improved notarization error handling
2021-07-14 23:35:45 +03:00
4d15f18d92
SL-15572 - retry logic for codeticket.py commands
2021-07-13 21:40:00 +01:00
502afc5ed2
SL-15572 - shorter sleeps in build.sh
2021-07-13 18:20:56 +01:00
3d57b7946a
SL-15572 - more sleeps in build.sh
2021-07-13 16:19:35 +01:00
e0eb9b96f7
SL-15572 - Possible fix for codeticket upload issue
2021-07-13 14:55:11 +01:00
95b26d3bec
Fix for SL-15560 pages with undefined html render with gray background instead of white in CEF v91
2021-07-12 14:17:04 -07:00
35f2b14c1d
Revert "SL-15434 Change default landmark destination"
...
This reverts commit efc8b268a2
2021-07-13 00:05:04 +03:00
3602d64a09
Fix for SL-15559 PDF files do not load in CEF v91
2021-07-12 12:50:34 -07:00
d53055406e
DRTVWR-521 xcode buildfix
2021-07-12 20:32:48 +03:00
674f5b7706
Merge branch 'build-hooks' into DRTVWR-521-maint
2021-07-12 18:55:25 +03:00
7a468f6273
SL-15528 Crash at reblendSettings
...
looks like blenders weren't inited yet.
2021-07-02 23:41:21 +03:00
66793abc71
SL-14075 allow exporting multiple textures with the same name
2021-07-02 16:11:39 +03:00
7a6b5a5984
SL-15383 Fix combobox's search highlights
2021-07-01 23:02:34 +03:00
d38866d030
SL-15512 Update text in the Favorites Bar and Favorites window
2021-07-01 13:42:14 +03:00
efc8b268a2
SL-15434 Change default landmark destination
2021-06-30 23:24:27 +03:00
21f70785d7
SL-15434 The 'Add to my Landmarks' star icon is not marked in the Top menu bar
2021-06-30 23:14:16 +03:00
b15f30a9ce
SL-15501 Viewer crash with unprotected use of std::vector::front()
2021-06-30 17:34:39 +03:00
6460b7ac41
SL-15500: Only run coding_policy_git.py on Mac
...
since it fails on Windows due to some problem in the underlying library.
Also wrap the coding policy checks in a TC log subsection.
2021-06-30 09:48:02 -04:00
d2de2f9d25
SL-15500: Always have to work around Windows path incompatibilities.
2021-06-30 08:11:30 -04:00
0276a32569
SL-15500: Use plain pip install, not pip_install shell function.
...
pip_install doesn't know about the '-r requirements.txt' feature.
2021-06-29 18:04:03 -04:00
ab185263fa
SL-15500: Install git-hooks (and requirements) and run policy check
...
on the entire current (branch of the) viewer repo before starting any build.
2021-06-29 17:45:13 -04:00
f9a6e31c76
SL-15500: A couple further tweaks to satisfy commit policy checker.
2021-06-29 16:51:28 -04:00
b9bab5952c
SL-15500: Merge branch 'utf8' into build-hooks
...
Since we're going to run the git-hooks validation over the whole repository at
the start of every viewer build, it's important that we start with a clean
pass. Certain text files contained non-ASCII, non-UTF8 characters. We had
already been down the path of identifying and replacing those with ASCII. Pull
in those changes.
2021-06-29 16:36:42 -04:00
2e790e9b72
DRTVWR-538: Merge branch 'master' into c++17
2021-06-29 10:48:02 -04:00
7956f7bfd3
SL-15458 Avatars who are moderators appear twice in popped-out IM session floater
2021-06-25 22:14:33 +03:00
3d92a7dfe2
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-06-25 01:02:29 +03:00
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
293272c2c7
Merge branch 'master' into DRTVWR-521-maint
2021-06-25 00:52:03 +03:00
a4c6c7059f
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
2021-06-25 00:51:02 +03:00
7ff743a138
Merge branch 'master' into DRTVWR-531
2021-06-24 14:37:20 -07:00
57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
467d8339c9
Increment viewer version to 6.4.21
...
following promotion of DRTVWR-518
2021-06-24 15:52:37 -04:00
abf8c4b364
SL-10297 windows local build fix
...
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
2021-06-24 18:37:22 +03:00
9451b50b2b
SL-15292 waitForChannel crash #4
2021-06-23 19:48:45 +03:00
7cc5b01ded
SL-15292 waitForChannel crash #3
2021-06-23 19:19:35 +03:00
9241a87b6f
SL-15292 waitForChannel crash #2
2021-06-23 18:32:57 +03:00
38765be8b0
Fix for: SL-15433 Update version of CEF used in the Viewer to 91.0.4472.114
2021-06-21 19:18:58 -07:00
45135a7c58
Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. Also includes a tweak to viewer_manifest.py to handle some CEF file changes"
2021-06-17 12:42:58 -07:00
c6b1aca74f
SL-15406 Removed text below initial login screen screenshots
2021-06-16 21:35:11 +03:00
Andrey Lihatskiy