Commit Graph

69051 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel c142812f84 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-05 11:20:00 +02:00
Ansariel b1c9d24934 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 11:19:36 +02:00
Ansariel 633a851d74 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-05 10:45:00 +02:00
Ansariel a4d60d06ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 10:43:31 +02:00
Ansariel ae2a0b24b8 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-05 10:00:17 +02:00
Ansariel 7991aaffa0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 09:59:12 +02:00
Andrey Kleshchev d647b75310 SL-17314 Location and label desync
Example: User can rename item in inventory, then attempt to save new landmark and changes will be lost
2022-05-05 01:05:01 +03:00
Andrey Kleshchev ad8634856d SL-17314 Don't focus inventory when handling landmark creation 2022-05-04 22:23:03 +03:00
PanteraPolnocy a54f7f6b0f Updated Polish translation (MFA) 2022-05-04 20:37:16 +02:00
Ansariel 08b1f4aae0 Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer 2022-05-04 20:18:30 +02:00
Ansariel fcfcc97d4a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-04 20:17:57 +02:00
Ansariel ac8c25f796 Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-05-04 20:14:00 +02:00
Ansariel 9e26fd1bcc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-04 19:31:48 +02:00
Andrey Kleshchev f3add82a4c Merge branch master (D550) into DRTVWR-546
# Conflicts:
#	indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
Ansariel 08cbde8ad1 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-05-04 19:06:56 +02:00
Ansariel 1e0e5743fe Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-04 19:06:46 +02:00
Andrey Lihatskiy 59d5443905 Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/viewer_components/login/lllogin.cpp
2022-05-04 18:52:52 +03:00
Andrey Lihatskiy 3f3b0e3b54 Merge branch 'master' into DRTVWR-483 2022-05-04 18:51:19 +03:00
Andrey Lihatskiy 7fff7eecb6 Merge branch 'master' into DRTVWR-543-maint 2022-05-04 18:51:05 +03:00
Andrey Lihatskiy 43a338c627 Merge branch 'master' into DRTVWR-543-maint_cmake 2022-05-04 18:50:59 +03:00
Andrey Lihatskiy 0e4ffe41bc Merge branch 'master' into DRTVWR-548-maint-N 2022-05-04 18:50:43 +03:00
Andrey Lihatskiy 2242f089e4 Merge branch 'master' into DRTVWR-561-maint-O 2022-05-04 18:50:36 +03:00
Nat Goodspeed bc7e2fb7e7 Increment viewer version to 6.5.6
following promotion of DRTVWR-550
2022-05-04 11:37:24 -04:00
PanteraPolnocy 1c2b030243 FIRE-31626, FIRE-31624 Updated translations for the info toast: French (Laurent Bechir), Russian (Romka Swallowtail) and Polish 2022-05-04 17:14:57 +02:00
Ansariel 0349e9aaeb Merge branch 'DRTVWR-550-mfa' of https://bitbucket.org/lindenlab/viewer 2022-05-04 15:04:24 +02:00
Ansariel 074f7096b7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-04 15:00:53 +02:00
Ansariel 0c7ace6097 Update German translation 2022-05-04 15:00:30 +02:00
Andrey Kleshchev 0569eb776c SL-16053 Landmark shouldn't be saved into location history 2022-05-03 22:25:46 +03:00
Zi Ree fdb2e35f0b Added info toast as a reminder that there is a followcam script holding camera controls when trying to use shift+esc to reset camera view. 2022-05-03 15:40:19 +02:00
Ansariel 410704b5c6 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-03 11:37:50 +02:00
Ansariel e10acd5931 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-03 11:34:20 +02:00
PanteraPolnocy 7c0f0a2dfc FIRE-31621 French translation update, by Laurent Bechir 2022-05-02 19:39:49 +02:00
Dave Parks 1a6eee4ea2 SL-17321 Fix for some particle systems with custom blend functions not rendering. 2022-05-02 11:52:45 -05:00
Nicky 932455384b Another place that needed generator expressions. 2022-05-01 15:14:34 +02:00
Nicky b75fe14716 Fix for viewer_manifest.py using a hardcoded path to grab runtime files. 2022-05-01 14:51:02 +02:00
Nicky db423fa972 ${AUTOBUILD_INSTALL_DIR}/lib/release is always needed as a fallback
linking directory.
2022-05-01 13:53:22 +02:00
Nicky 756a10eeac Simplify cmake files by uaing generator expressions and be more
configuration specific, rather than staging files to Release and
RelWithdebInfo all the time
2022-05-01 13:37:44 +02:00
Nicky 283c2a20cc Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
sets the property on those.
2022-05-01 00:38:40 +02:00
Nicky 9a77d35461 FIRE-30839 "Camera window not fully opaque at 1.00 and doesn't have StarLight & Silver Blue support" contribution by Scentual Lust. 2022-04-30 14:01:11 +02:00
Nicky 29cd344789 Revert "Remove unmaintained starlight skin."
This reverts commit a89f29a343.
2022-04-30 13:19:32 +02:00
Nicky 94716c2728 Revert "Starlight/Latency removal post-cleanup"
This reverts commit 1287656ff4.
2022-04-30 13:19:22 +02:00
Nicky 21caff1c7a Revert "Starlight? Wat dat?"
This reverts commit 8dc785c484.
2022-04-30 13:19:11 +02:00
Liny 4ee757a91b FIRE-31322 Fix linux notifications being low priority and ignored by recent gnome versions. 2022-04-29 13:47:13 -07:00
Andrey Kleshchev da6f4204b7 SL-17124 make sure window thread wakes up to proces 'quit' message 2022-04-29 22:18:20 +03:00
PanteraPolnocy 53d0d13da3 Few adjustments in About floater 2022-04-29 19:06:47 +02:00
PanteraPolnocy e593bf4112 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-29 18:43:33 +02:00
PanteraPolnocy 9983356e6d FIRE-31614 Updated Russian translation, by Romka Swallowtail 2022-04-29 18:43:23 +02:00
Andrey Kleshchev 904b16a0a7 SL-17124 switchContext and loadShaderFile crashes
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
Mnikolenko Productengine ddaa0d84cc SL-17206 FIXED Unable to move an avatar after fall on the ground 2022-04-29 19:06:22 +03:00
Ansariel 6e83be2167 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-29 14:27:09 +02:00