Commit Graph

44232 Commits (90dbc4eaf7d30346dc658a32e80f4e9ad5841c2b)

Author SHA1 Message Date
Brad Kittenbrink 90dbc4eaf7 DRTVWR-550 oops, more correct formatting for branch viewer_channel variable naming. 2022-01-05 15:05:39 -08:00
Brad Kittenbrink 262b5cdd18 DRTVWR-550 correct formatting of branch variable name for viewer_channel 2022-01-05 13:39:37 -08:00
Brad Kittenbrink b37699acaa DRTVWR-550 setting viewer channel name for project build 2022-01-04 10:24:49 -08:00
Brad Kittenbrink 1e6caa69e6 Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfa 2021-12-15 17:06:24 -08:00
Brad Kittenbrink 95e2f6286c SL-16388 Improvements to llfloatermfa.cpp from code review 2021-12-15 17:05:53 -08:00
Nat Goodspeed 0a873cd955 Increment viewer version to 6.5.2
following promotion of DRTVWR-552
2021-12-15 13:35:36 -05:00
Brad Kittenbrink (Brad Linden) ea2ae3769f SL-16388 floater_mfa line wrapping fix when the server message is very long 2021-12-14 12:53:27 -08:00
Brad Kittenbrink 6aa438aa60 SL-16388 fixed copyright header dates for new MFA floater source files 2021-12-14 12:00:03 -08:00
Brad Kittenbrink b74dc0e27a SL-16388 Viewer MFA fix Duplicate Listener crash when first token challenge failed
also cleaned up some xui warnings
2021-12-14 09:07:09 -08:00
Brad Kittenbrink 6d177898a9 SL-16501 SLMFAHash is now saved client side 2021-12-13 14:58:38 -08:00
Brad Kittenbrink 30cd108c7e SL-16388 Viewer MFA Implementation Improvements
token input is now handled and message formatting is improved.
Added beginnings of support for saving slmfa_hash value client side.
2021-12-06 16:17:55 -08:00
Mnikolenko Productengine 630c442744 SL-16119 update link text 2021-11-30 01:19:44 +02:00
Mnikolenko Productengine ef0b48ce5a SL-16119 Viewer should now direct IM 2 Email setting to web 2021-11-30 01:19:43 +02:00
Andrey Kleshchev 850767eb21 SL-16396 Updater fails with "takes exactly 3 arguments" error 2021-11-29 21:55:45 +02:00
Brad Kittenbrink d307843dd4 SL-16388 Viewer MFA Implementation
We now present MFA errors to the user during login and prompt them for
an authentication token.
2021-11-23 17:45:22 -08:00
Brad Kittenbrink a1fb89ebb6 SL-16365 Viewer adds empty mfa token to login params 2021-11-23 17:44:06 -08:00
Andrey Lihatskiy ab4d4a4817 Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
# Conflicts:
#	indra/newview/app_settings/settings.xml
2021-11-16 01:24:03 +02:00
Andrey Lihatskiy 0505c6ebbb Merge branch 'master' into DRTVWR-534
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +02:00
Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519
# Conflicts:
#	README.md
2021-11-16 01:21:05 +02:00
Nat Goodspeed 9957c28ddc Increment viewer version to 6.5.1
following promotion of DRTVWR-545
2021-11-15 17:44:28 -05:00
Andrey Lihatskiy 8dd9554eb5 SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat
by Callum
2021-11-09 02:38:58 +02:00
Andrey Lihatskiy 60f2bffa7c SL-16299 Added the correct @rpath for libvlc 2021-11-07 03:44:08 +02:00
Brad Kittenbrink 0a7a367088 SL-16299 fix warning about CFBundleIdentifier not matching PRODUCT_BUNDLE_IDENTIFIER 2021-11-04 14:35:12 -07:00
Andrey Lihatskiy a37a36c408 SL-16299 Updated dullahan to CT build 565428; entitlements cleanup 2021-11-04 01:10:46 +02:00
Andrey Lihatskiy e70415f1d7 SL-16299 Added entitlements for the app bundle signing 2021-11-03 20:01:57 +02:00
Andrey Lihatskiy 6921edcc39 SL-16293 Updated vlc to CT build 565299 2021-11-01 21:23:12 +02:00
Andrey Kleshchev 404e69e594 SL-15462 Convert waitForChannel() into state machine 2021-10-28 21:25:38 +03:00
Andrey Lihatskiy 8acce67f95 SL-16247 Post-d520 libvlc plugin fixes
by Callum
2021-10-28 00:52:03 +03:00
Mnikolenko Productengine a95d846a5c SL-16218 treat texture selection similar to diffuse map handling. 2021-10-25 15:15:02 +03:00
Callum Prentice 725fc6fa85 Fix for SL-16208 Introduce a canonical_repo tag into the autobuild.xml file for new 3p repos - no new code introduced in this pass 2021-10-19 15:23:08 -07:00
Andrey Kleshchev a701165522 SL-16047 Strip unused includes 2021-10-18 17:36:14 +03:00
Andrey Lihatskiy 64f76f17ca DRTVWR-545 Raised the viewer version to 6.5.0 2021-10-14 21:26:34 +03:00
Callum Linden 3c2ccd879c Merge with master after latest Viewer release 2021-10-13 16:54:08 -07:00
Callum Prentice 8a1bc1b9e2 Merge with head of Master after a new Viewer release 2021-10-13 14:47:06 -07:00
Andrey Lihatskiy fb170ffe21 Merge branch 'master' into DRTVWR-545-maint-mix 2021-10-14 00:35:08 +03:00
Nat Goodspeed cbaba2df56 Increment viewer version to 6.4.24
following promotion of DRTVWR-520
2021-10-13 16:52:44 -04:00
Andrey Kleshchev 1e7fd6302a SL-15462 Refactor voiceControlCoro() into a state machine #2 2021-10-13 22:05:36 +03:00
Andrey Kleshchev 241881309a SL-15462 Refactor voiceControlCoro() into a state machine #1 2021-10-13 22:05:36 +03:00
Andrey Kleshchev dddb349896 SL-16106 Fixed asset storage trying to request data on shutdown 2021-10-13 22:00:41 +03:00
Andrey Lihatskiy 70551782f1 DRTVWR-545 New line for the coding policy check 2021-09-28 19:44:52 +03:00
Andrey Lihatskiy adcd08fbf4 Revert "Merge branch 'c++17' into DRTVWR-522-maint"
This reverts commit 203ea3a70a, reversing
changes made to 8e3f077886.

# Conflicts:
#	indra/newview/llmachineid.cpp
2021-09-28 19:22:18 +03:00
Andrey Kleshchev e3b869e6f1 SL-16087 [D545] New clothes do not have the word 'New' in their names 2021-09-27 22:13:40 +03:00
Andrey Lihatskiy 717fe2cc5c DRTVWR-520 Updated dullahan to codeticket build 563968 2021-09-23 10:57:37 +03:00
Andrey Lihatskiy 9bcd860f53 SL-15903 SLPlugin entitlements fix 2021-09-23 01:50:05 +03:00
Andrey Lihatskiy f2582cacf7 SL-15612 Value fix 2021-09-21 19:42:43 +03:00
Andrey Lihatskiy 30c0043ba3 SL-15612 Check for SKIP_NOTARIZATION evn. variable 2021-09-21 19:37:15 +03:00
Andrey Lihatskiy 4a411d9896 Revert "DRTVWR-520 Updated dullahan to codeticket build 562751"
This reverts commit adb724564d.
2021-09-21 19:31:04 +03:00
Andrey Lihatskiy 316753352e SL-15903 Restored the lost code 2021-09-21 14:36:16 +03:00
Andrey Kleshchev f30cc7b5bb Revert "SL-11841 make ‘Push to talk’ the default setting"
This reverts commits:
126877bc5b
b661f62a7a
ce660c7e7b
2021-09-21 00:20:37 +03:00
Andrey Kleshchev ce660c7e7b SL-11841 Fix PushToTalkToggle being set incorectly
Due to changed defaults, legacy compatibility will no longer work corectly, remove it
2021-09-18 00:08:27 +03:00