329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
a9a63db0f0
Merge branch 'master' into DRTVWR-548-maint-N
2022-08-31 00:17:37 +03:00
5c18921e9a
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 00:16:09 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
1b369c7f10
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
3e60b53d52
SL-16182: Offload audio decoding from the main thread to the general work queue.
...
The work queue callback binds "this". This is deemed safe due to current dependencies, but see the associated comment in the return callback. There was some trial and error to get a this-binded lambda to compile.
Due to LLVorbisDecodeState writing to disk off-thread, limit audio decodes proportional to general worker thread count. Guess the thread count for now.
2022-06-14 11:31:52 -07:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
4ffc6c3fde
SL-15312 Tweaks and fixes
...
- Allowed resizing text fields for classifieds in profiles
- Fixed mislabeled floater from picks to classifieds
- Fixed classified floater's title
- Added support to see multiple classifieds
- Removed obsolete panels
- Fixed pick requests for various menus
- Fixed pick creation from landmarks
- Improved online status handling
- Updated headers in files
2022-05-31 01:47:30 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
6309500557
SL-17356 Viewer changes for Premium Plus support
2022-05-11 21:05:46 +03:00
3c215ee885
SL-17356 Viewer changes for Premium Plus support
2022-05-06 10:22:49 +03:00
f3add82a4c
Merge branch master (D550) into DRTVWR-546
...
# Conflicts:
# indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
59d5443905
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/viewer_components/login/lllogin.cpp
2022-05-04 18:52:52 +03:00
3f3b0e3b54
Merge branch 'master' into DRTVWR-483
2022-05-04 18:51:19 +03:00
7fff7eecb6
Merge branch 'master' into DRTVWR-543-maint
2022-05-04 18:51:05 +03:00
372a04dd51
Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get lost in case of crash
2022-04-25 12:35:07 -07:00
ffdc04f5d2
SL-17040 Crash due to LLWord not existing
...
LLWord should persist till the end due to wide usage.
2022-04-21 22:58:30 +03:00
cf7bc4406e
SL-17159 Crash initializing LLInstanceTrackerPrivate
2022-04-21 20:43:50 +03:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
e9921e77b0
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-04-18 13:29:25 -07:00
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
65ea8e1351
Merge branch 'master' into DRTVWR-483
2022-04-18 20:39:18 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
1497177868
Merge remote-tracking branch 'origin/SL-16950' into DRTVWR-540-maint
2022-04-05 18:01:45 +03:00
3feb92046f
SL-16831 Viewer stalls for 10 seconds before displaying a login failure
...
# Conflicts:
# indra/newview/llstartup.cpp
2022-03-29 16:22:11 +03:00
090b506612
SL-16831 Viewer stalls for 10 seconds before displaying a login failure
2022-03-24 18:47:08 +02:00
f5d74ec827
SL-11216: To display release notes, listen on "relnotes" LLEventPump.
...
Now, when the viewer decides it's appropriate to display release notes on the
login screen, wait for SLVersionChecker to post the release-notes URL before
opening the web floater.
2022-03-24 17:49:20 +02:00
3b6a4facae
SL-17041 Texture loading was slower at login on Performance viewer
2022-03-23 16:37:31 +02:00
6bdd744d78
SL-17019 mfa_hash should get saved per-username
2022-03-17 13:29:12 -07:00
87b494f585
Oops, forgot the other half of SL-16825 fix. need to check both "RememberUser" and "RememberPassword" settings
2022-03-08 17:41:50 -08:00
7c0f49435d
SL-16950 - handle case that an initial outfit is created in user inventory before first login
2022-03-08 19:25:10 +00:00
89ab1e4525
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-03-07 00:19:11 -08:00
40b80251e4
SL-16825 saving of mfa_hash data now obeys the 'Remember Me' setting
2022-03-07 00:15:59 -08: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
e70fe3a50d
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2022-02-28 22:01:18 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
8422183958
Related to fix for SL-16792, standardize on naming the filed simply mfa_hash end-to-end to avoid confusion
2022-02-04 14:28:07 -08:00
350d2c5d7a
SL-14769 Allow to log-in, even if there's an inventory error
2022-02-02 02:55:32 +02:00
676ed67485
SL-12335 Viewer loaded notifications from wrong file
2022-01-21 02:23:06 +02:00
96a6d21086
SL-16514 store mfa hash in protected data using LLSecAPIBasicHandler
2022-01-14 22:24:52 -08:00
3032ef97a9
SL-16593 Viewer login gets stuck requesting caps
...
Error happens before viewer enters STATE_SEED_GRANTED_WAIT, so couldn't bypass straight to STATE_SEED_CAP_GRANTED and had to implement an error state. But in this case might be better to fail login immediately.
2022-01-06 00:27:23 +02:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
b33e18585d
Merge branch 'master' into DRTVWR-483
2021-12-26 14:00:00 +02:00
1e6caa69e6
Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfa
2021-12-15 17:06:24 -08:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
Andrey Lihatskiy