Commit Graph

60673 Commits (93a457689d9d6ebcaf1968e85186758dfbf81fc5)

Author SHA1 Message Date
Kitty Barnett 93a457689d Merge branch 'rlva/development' into master 2020-06-13 22:05:19 +02:00
Kitty Barnett fa07fe8d1c Merge branch 'rlva/development' (v2.2.3) into rlva/development 2020-06-13 21:04:48 +02:00
Kitty Barnett 386943e007 Merge branch 'viewer/build' nto rlva/development 2020-06-13 20:59:05 +02:00
Kitty Barnett c9646050ef Incremented version to RLVa-2.2.3 2020-06-13 20:55:27 +02:00
Kitty Barnett 5be88df318 Add @setcam_eyeoffsetscale:<multiplier>=n and @setcam_eyeoffsetscale[:<multiplier>]=force 2020-06-13 00:01:49 +02:00
Kitty Barnett 9b58b4b7c8 @setcam_eyeoffset and @setcam_eyeoffsetscale fix-ups due to camera presets 2020-06-12 16:05:34 +02:00
Kitty Barnett fd313a7061 Merge branch 'lindenlab/camera-presets' into rlva/development 2020-06-12 15:38:34 +02:00
Kitty Barnett fb670069b0 Merge branch 'rlva/development' (v2.2.3 + v2.3.0 - both WIP) 2020-06-12 12:51:11 +02:00
Kitty Barnett 4f05d71e49 Merge branch 'rlva/development' into rlva/development 2020-06-11 17:49:32 +02:00
Kitty Barnett b0e3bb9184 Merge branch 'viewer/build' into rlva/development 2020-06-11 17:48:32 +02:00
Kitty Barnett f747f34da4 Merge with RLVa (pre-EEP fix-up)
-> Gets a couple of large LL merges out of the way
2020-06-11 12:45:52 +02:00
Kitty Barnett 9d755566f6 Merge with RLVa (v2.2.2) 2020-06-10 23:25:08 +02:00
Kitty Barnett a6e18a4450 Merge with RLVa (v2.2.1)
-> Should be as close to a null-merge as we can get
  -> Some commits were cherry picked in on the FS master branch
2020-06-10 23:16:58 +02:00
Kitty Barnett 1bee1e0eda Merge branch 'rlva/bugfix/ordered-shutdown' into rlva/development 2020-06-10 15:19:15 +02:00
Kitty Barnett 492e870d9f Merge branch 'rlva/bugfix/give-to-rlv' into rlva/development 2020-06-10 12:45:03 +02:00
Kitty Barnett 3bc3233a0b Merge branch 'viewer/build' into viewer/build 2020-06-09 15:34:00 +02:00
Kitty Barnett 1bc3d1a186 Merge branch 'lindenlab/release' into viewer/build 2020-06-09 15:33:40 +02:00
Kitty Barnett 2fa3ad363a Merge branch 'viewer/build' into viewer/build 2020-06-09 15:29:37 +02:00
PanteraPolnocy 102b1b5031 FIRE-29669 Russian translation update, by Romka Swallowtail (deletions) 2020-06-08 19:19:11 +02:00
Beq b4cd4a27bf make fix for FIRE-29679 more general
this revokes previous changes in llface.cpp and moves them lower down
the stack so that the additional safety check appliesto call callers.
2020-06-08 12:24:48 +01:00
Ansariel e864a3379b Update German translation 2020-06-08 10:03:33 +02:00
PanteraPolnocy 15d50de591 FIRE-29669 Russian translation update, by Romka Swallowtail 2020-06-07 23:32:24 +02:00
PanteraPolnocy 693f175bde Updated Polish translation 2020-06-07 22:06:27 +02:00
PanteraPolnocy dbfc2e4de5 Fixing text string localizability in floater_fixedenvironment.xml 2020-06-07 21:51:43 +02:00
Ansariel f0fa157e10 Correct label name for new daycycle setting default name 2020-06-06 22:21:44 +02:00
Beq 385dff329e update to fix for FIRE-29679 2020-06-06 02:59:05 +01:00
Beq 22e33533de FIRE-29679 - fix crash on rezzing mesh as selected 2020-06-06 01:24:06 +01:00
Ansariel c354377db1 FIRE-29678: Unable to edit full perm notecard in external editor 2020-06-05 22:06:57 +02:00
Ansariel af11eaa8d0 FIRE-29672: Fix status bar for Italian localization 2020-06-05 11:23:35 +02:00
Ansariel fe261a1456 FIRE-29362: Remove "Show hovertips on all object" setting from preferences because of a changed behavior from LL 2020-06-04 11:41:14 +02:00
Ansariel fff4e698f0 Fix for broken local avatar texture bakes by Rye Mutt (Alchemy Viewer) 2020-06-04 11:16:22 +02:00
Beq 02bbb8e046 align to FSDATA 2020-06-03 17:13:18 +01:00
PanteraPolnocy f3286c3f5d Updated Polish translation 2020-06-03 17:20:43 +02:00
Ansariel 0bad9728cd Fix build when not building with FMOD Studio 2020-06-03 16:48:03 +02:00
Ansariel 06ecf80323 FIRE-29661: Fix build when compiling with OpenAL 2020-06-03 08:13:57 +02:00
Ansariel 01dfb02bc6 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2020-06-02 21:56:03 +02:00
Ansariel 800eedb195 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-06-02 21:55:22 +02:00
Nat Goodspeed 1702a65665 Increment viewer version to 6.4.4
following promotion of DRTVWR-508
2020-06-02 15:26:22 -04:00
Ansariel fe90a18a68 Clean up duplicate include 2020-06-02 20:05:33 +02:00
Ansariel 45d78fe3d1 Revert "Add FMOD logo to about floater"
This reverts commit cf8b96841a.
2020-06-02 19:11:08 +02:00
PanteraPolnocy 286f89dd61 FIRE-29641 Russian translation update (Phototools flater) 2020-06-02 14:54:56 +02:00
Beq eb83f1b3a4 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-06-02 01:40:07 +01:00
Ansariel 8cfd82c946 This shouldn't have been replaced... 2020-06-02 00:18:58 +02:00
Ansariel 6e118b842d Fix search floater race condition screwing up layout when switching tabs before search results arrive 2020-06-02 00:16:44 +02:00
Beq 9697c5ba3f OpenSim - Crash in transaction completion (via bugsplat) 2020-06-01 22:49:41 +01:00
Ansariel df14857200 Update German translation 2020-06-01 18:37:15 +02:00
PanteraPolnocy cf10106c1e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-06-01 17:50:52 +02:00
PanteraPolnocy 433e14e5c4 Updated Polish translation (EEP) 2020-06-01 17:50:39 +02:00
Ansariel 1af3bd238c Fix cut-off labels on area search floater 2020-06-01 16:57:56 +02:00
Ansariel 17e39d3fd9 FIRE-29642: Show 0m as distance for HUD attachments in area search 2020-06-01 16:55:06 +02:00