livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,216 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

64216 Commits (4b3ddda5b03eee55059cd67d0384b99fd1479761)

Author SHA1 Message Date
Kitty Barnett 4b3ddda5b0 Merge branch 'rlva/development' 2021-06-08 20:10:50 +02:00
Kitty Barnett 47287e39aa Merge commit '3bfc1e03536b68c56065a76d5c8433fd31590c63' (keeps C++17 fixes out of FS) 2021-06-08 20:06:08 +02:00
Ansariel de69fdc2ed Add missing water transparency performance options 2021-06-08 19:48:03 +02:00
Ansariel c463d9dcc8 Update German translation 2021-06-08 17:32:15 +02:00
Zi Ree a52eff1b89 Workaround for broken participant list: always show group moderation tools regardless of user permissions, change toggle mute chat to explicit mute and unmute so accidents can no longer happen 2021-06-08 15:37:16 +02:00
Ansariel 64b65c3719 Clean up 2021-06-08 10:13:29 +02:00
Nicky d75af8f721 Buildfix for non OpenSim builds. 2021-06-08 09:41:39 +02:00
Ansariel 111790cb81 Doesn't exist anymore 2021-06-08 00:18:46 +02:00
Ansariel b8ed261417 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm 2021-06-07 21:40:41 +02:00
Ansariel 5795359b93 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-06-07 20:55:58 +02:00
Ansariel bc7c4fb82a Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm 2021-06-07 20:55:41 +02:00
Ansariel 18b3710cee Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-07 20:55:05 +02:00
Nat Goodspeed 4623b82238 Increment viewer version to 6.4.20 
following promotion of DRTVWR-525
 2021-06-07 13:48:49 -04:00
Beq 80ca9911c4 Back out ctrl-alt-H binding that overrides pre-existing FS binding 2021-06-07 14:15:42 +01:00
PanteraPolnocy 685c3b70a8 FIRE-30990 French translation update, by Laurent Bechir 2021-06-05 17:36:42 +02:00
PanteraPolnocy 25c485990c Russian translation update, by Romka Swallowtail 2021-06-03 11:38:26 +02:00
PanteraPolnocy 31a66389af Updated Polish translation 2021-06-01 20:24:31 +02:00
Ansariel 6ec1a1f8f4 Update German translation 2021-05-31 09:07:42 +02:00
Ansariel 06d5f5339a Increase label width 2021-05-31 09:07:34 +02:00
Ansariel a1d9351739 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-31 08:29:56 +02:00
Beq 1ef2f20d12 de-couple the imageworkerthreads 2021-05-31 01:38:27 +01:00
Beq fe28f62187 Add thread names to Telemetry 2021-05-31 01:33:15 +01:00
Beq dcdc510e69 FIRE-30947 - Auto-unmute Sounds/Ambient from patch by Rebecca Ashbourne 2021-05-29 21:45:09 +01:00
Ansariel 72bd38a0ce Copy&paste error 2021-05-29 22:40:02 +02:00
Kitty Barnett 7c53927327 Add support for multiple overlays in the same linkset (and support permanence in @setoverlay restrictions that aren't currently active) 2021-05-29 19:16:42 +02:00
Kitty Barnett e99a63f12a Merge branch 'world/effect-base' into rlva/development 2021-05-29 19:13:22 +02:00
Kitty Barnett 1fd98d08d2 Allow dynamic changes to effect priority 2021-05-29 19:17:31 +02:00
Kitty Barnett 70237de361 Add actual support for effect priority and enabled/disabled state 2021-05-29 18:08:22 +02:00
Kitty Barnett 196029d002 CATZ-590: Unpredictable results occur when both @setsphere and @setoverlay are set by the same object 2021-05-29 17:41:15 +02:00
Kitty Barnett db154bd788 Merge branch 'world/effect-base' into rlva/development 2021-05-29 17:40:22 +02:00
Kitty Barnett a0ff6c3542 Allow effect ids to be reused for each visual effect (but enforce uniqueness across all instances of the same effect) 2021-05-29 17:37:59 +02:00
Liny 9f3b23bd05 Fix mac and linux builds. 2021-05-28 19:28:10 -07:00
PanteraPolnocy ccc9196baa Updated Polish translation 2021-05-29 03:47:20 +02:00
Beq f8204c43e8 Restore the "proper" mismatched indents cos Beq was sleep coding 2021-05-28 11:08:32 +01:00
Beq b979ddef7d FIRE-30979 Fix Ambient Lighting in Mesh preview 
and a couple of typo fixes
 2021-05-28 03:58:37 +01:00
Beq 99027205df FIRE-30965 Improve mesh upload error + rewrite subset checks 
Rewrite material parsing to properly implement material subset with the NoGeometry tag.
 2021-05-28 03:07:14 +01:00
Beq 20cd749175 Instrument threaded texture decode 
includes fix for timeout in slow decoded bakes
 2021-05-28 02:22:53 +01:00
Ansariel f7e2f750d8 FIRE-30962: Fix animation details not being displayed for animations in task inventory 2021-05-27 19:39:40 +02:00
Ansariel 609cf90e3c Fix surprising render results 2021-05-27 18:12:03 +02:00
Ansariel abdc9b68b8 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-05-27 15:22:26 +02:00
Zi Ree fb7a9106cd FIRE-30967 - When clearing inventory cache, also clear library cache 2021-05-27 14:01:48 +02:00
Ansariel 42458a2049 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm 2021-05-27 10:50:17 +02:00
Euclid Linden 4cb5d10a3f Merged in euclid-15299 (pull request #580) 
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.

Approved-by: Andrey Kleshchev
 2021-05-26 18:53:28 +00:00
Dave Houlton 7199ce4514 SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks. 
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef.
 2021-05-26 10:57:39 -06:00
Ansariel e6befde465 Update German translation 2021-05-23 01:54:52 +02:00
Ansariel 1cb2089a11 Layout fixes in mesh upload preview floater 2021-05-23 01:54:40 +02:00
Ansariel 14347fbc78 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-23 01:19:08 +02:00
PanteraPolnocy 40ab624875 FIRE-30972 French translation update, by Laurent Bechir 2021-05-22 02:26:04 +02:00
PanteraPolnocy dc752e2d0a FIRE-30971 Russian translation update, by Romka Swallowtail 2021-05-21 17:13:44 +02:00
Beq f1be8cd48a Expose thread pool setting for image decode 2021-05-21 01:58:15 +01:00