Commit Graph

68389 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Ansariel 59e8ee021e Remove duplicate assert 2022-08-10 01:21:13 +02:00
Ansariel 7d8da40d6f FIRE-15917 / FIRE-31906: Shot in the blue fix attempt for mesh attachments sometimes vanishing after teleports 2022-08-10 00:49:01 +02:00
Zi Ree 08acbbec54 Linux SDL2 - Make SDL2 default, remove USE__SDL2 flag, add USE_SDL1 flag instead to go back to SDL1 if needed 2022-08-09 14:48:20 +02:00
Andrey Kleshchev 946bdc1ee3 SL-14556 Profile floater does not update after a name change 2022-08-08 22:38:56 +03:00
PanteraPolnocy c9728f1208 FIRE-31916 French translation update, by Laurent Bechir 2022-08-08 19:45:27 +02:00
PanteraPolnocy 149ff97e25 Updated Polish translation 2022-08-08 00:51:32 +02:00
Ansariel 6beaf27b7c Create SUP ticket instead of FIRE when reporting a problem 2022-08-07 21:22:22 +02:00
Nicky 1147d8ee1e Update fmodstudio 2022-08-07 14:22:52 +02:00
PanteraPolnocy f0772c850e French translation - minor changes
Can be modified later if needed
2022-08-06 13:29:28 +02:00
PanteraPolnocy 20c075e6c4 FIRE-31900 French translation update (copypaste), by Laurent Bechir 2022-08-06 13:05:35 +02:00
Andrey Kleshchev 12c7f42004 SL-17908 No left and right events when both held down
Reverts part of SL-15746
2022-08-06 12:02:22 +02:00
Ansariel 637ddfa009 FIRE-31551: Fix aggressive switching into mouselook when pressing M 2022-08-05 23:38:57 +02:00
Andrey Kleshchev bc26931482 SL-17908 No left and right events when both held down
Reverts part of SL-15746
2022-08-05 19:44:54 +03:00
PanteraPolnocy aa9728c98d Polish translation: Revert a few strings in build floater to industry standard, as no one really names them like that 2022-08-05 16:28:09 +02:00
Ansariel 21587fe4f6 Fix a few cases where the avatar username wasn't used to create a mute in the mutelist 2022-08-04 22:36:33 +02:00
Andrey Kleshchev 09400b74ad SL-17902 Crash at LLAlignedArray, out of bounds 2022-08-04 22:14:08 +03:00
Ansariel 30545a1cb4 How did this happen??? 2022-08-04 19:11:28 +02:00
Ansariel 0b0c697d4e Fix flip texture scale buttons magically jumping when switching texture mode 2022-08-04 18:55:51 +02:00
PanteraPolnocy 0f9ffbe1f3 Updated Polish translation (copypaste) 2022-08-04 17:24:52 +02:00
Mnikolenko Productengine e3ef38876b SL-17785 FIXED World Map scrolls too slowly after pressing "Me" button 2022-08-04 17:45:06 +03:00
Ansariel 409befbd69 Fix "Mimimimimi... I'm a whiny pedantic GCC compiler... Mimimimi" issue... 2022-08-04 14:58:57 +02:00
Ansariel 98caa32a32 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-08-04 14:53:14 +02:00
Ansariel 49b6f9b312 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 14:52:20 +02:00
Ansariel 3b522463ef Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-08-04 14:19:13 +02:00
Ansariel 9f3cbadd29 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 14:18:46 +02:00
Ansariel ee48e97da7 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-08-04 12:42:16 +02:00
Ansariel 6d09c9ff89 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 12:37:05 +02:00
Nicky d0848a2ac0 Linux: cef needs a dependency on llwindow to properly propagate the SDL defines. 2022-08-04 12:19:47 +02:00
Ansariel d1fed007a6 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-08-04 11:07:53 +02:00
Ansariel bdf11dace5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 11:07:38 +02:00
Andrey Lihatskiy 51efcfea25 DRTVWR-544 Post-merge build fix 2022-08-04 01:51:07 +03:00
Nicky 3866fcfdc3 Streamline SDL1/SDL2 propgation and handle it in one place rather than having it multiple times
in the cmake files.
2022-08-04 00:46:42 +02:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
Andrey Lihatskiy ea26ee5e92 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
Andrey Kleshchev 014d7616b6 Merge branch master (DRTVWR-561) into DRTVWR-483 2022-08-04 00:15:15 +03:00
Nat Goodspeed 9dba9f80f4 Increment viewer version to 6.6.3
following promotion of DRTVWR-561
2022-08-03 17:04:10 -04:00
PanteraPolnocy bd93044cbd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-03 16:49:30 +02:00
PanteraPolnocy a5ab97011e FIRE-31861 Properly position status bar icons in French translation 2022-08-03 16:49:23 +02:00
Zi Ree 2ab6dd9344 Linux SDL2 - make keyboard input work for the CEF plugin, still a couple funky keys left to deal with later 2022-08-03 13:56:01 +02:00
Nicky 2b6427e1ba Remove some old code. 2022-08-03 10:49:53 +02:00
Nicky 0295e77041 Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm 2022-08-03 10:43:47 +02:00
Nicky dad5b8e78e Example code for SDL2/CEF. 2022-08-03 10:43:05 +02:00
Ansariel 1435db5316 FIRE-31882: Fix main menu bar receiving focus when minimizing docked floaters 2022-08-03 10:37:43 +02:00
Ansariel b2fe1465ad Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 23:05:34 +02:00
Andrey Kleshchev 86b7b16150 SL-17048 Fixed not cleaning session 2022-08-02 23:04:51 +02:00
Ansariel b6007f059b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 14:35:55 +02:00
Zi Ree d0e86fb534 re-apply the alt/ctrl filter in SDL_TEXTINPUT to prevent extra characters showing up in text boxes when using e.g. alt+h 2022-08-02 13:57:46 +02:00
Ansariel a0915f707d Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-08-02 12:51:33 +02:00
Ansariel b7d3cab3f2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:51:12 +02:00
Ansariel 0d0d82fa97 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-08-02 12:08:32 +02:00