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

45259 Commits (c5e3ace94de01ed61ed43284ea72dacec197cdc9)

Author SHA1 Message Date
Dave Parks 04edc15185 SL-16544 Fix for rigged mesh bounding boxes 2022-01-13 17:04:46 +00:00
Euclid Linden ac233a46d8 Merged in DV546-merge-6.5.3 (pull request #830) 
DRTVWR-546 merge up to 6.5.3
 2022-01-13 00:18:53 +00:00
Dave Houlton b10d445918 Merge branch 'master' v6.5.3 into DRTVWR-546 (leaving VIEWER_VERSION @ 6.6.0) 2022-01-12 16:25:11 -07:00
Andrey Lihatskiy 1b90d81fdf Merge branch 'master' into DRTVWR-540-maint 2022-01-13 00:17:48 +02:00
Andrey Lihatskiy efe9f0e865 Merge branch 'master' into DRTVWR-553-maint-mix-JK 2022-01-12 23:32:18 +02:00
Nat Goodspeed 1ec05e9369 Increment viewer version to 6.5.3 
following promotion of DRTVWR-554
 2022-01-12 16:25:40 -05:00
Andrey Kleshchev 093395b489 SL-15997 Windows 11 detection #2 2022-01-12 21:31:24 +02:00
Andrey Kleshchev a3d14e89a3 SL-15997 Windows 11 detection 2022-01-12 21:30:43 +02:00
Andrey Kleshchev 38e77cb958 SL-16614 Viewer's uploader crash with RenderGLCoreProfile 2022-01-12 20:01:36 +02:00
Andrey Lihatskiy 84d989acac SL-11875 Verbose log 2022-01-11 23:53:26 +02:00
Andrey Kleshchev 59356963c4 SL-16614 Viewer's uploader crash with RenderGLCoreProfile 2022-01-11 21:29:04 +02:00
Andrey Lihatskiy aa69e18b10 SL-16565 Added com.apple.security.device.audio-input to the hardened runtime entitlements 2022-01-11 20:09:00 +02:00
Andrey Lihatskiy 6946a6a997 SL-16565 Added com.apple.security.device.audio-input to the hardened runtime entitlements 2022-01-11 19:54:02 +02:00
Andrey Kleshchev 936fd8ce49 SL-16626 Performance Viewer, bump minor version number to 6.6 2022-01-11 17:31:17 +02:00
Andrey Lihatskiy 6c029e4858 DRTVWR-533 Updated LLCA to CT build 567162 2022-01-11 02:30:30 +02:00
Andrey Lihatskiy 03a7ec55c9 Revert "SL-11841 make ‘Push to talk’ the default setting" 
+ post merge conflict fix
 2022-01-11 02:30:30 +02:00
Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK 
# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:51:52 +02:00
Andrey Kleshchev 82a3c185cd SL-16604 Double click teleport should ignore clicking own nametag 2022-01-06 23:28:36 +02:00
Andrey Kleshchev bc78cf0b51 SL-16604 Double click teleport should ignore clicking yourself 2022-01-06 21:55:25 +02:00
Brad Kittenbrink 90dbc4eaf7 DRTVWR-550 oops, more correct formatting for branch viewer_channel variable naming. 2022-01-05 15:05:39 -08:00
Brad Kittenbrink 262b5cdd18 DRTVWR-550 correct formatting of branch variable name for viewer_channel 2022-01-05 13:39:37 -08:00
Brad Kittenbrink b37699acaa DRTVWR-550 setting viewer channel name for project build 2022-01-04 10:24:49 -08:00
Andrey Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Andrey Kleshchev ee2d618706 SL-16564 'Click to' action 'None' doesn't work as intended 
There shouldn't be any differences for 'None' between normal objects and attachments
 2021-12-19 14:01:33 +02:00
Andrey Kleshchev 91940a0e2c SL-16517 Dragging a physic object #2 
mLastMouseX/Y might need to be assigned from gViewerWindow->getCurrentMouseX();
 2021-12-18 03:59:31 +02:00
Michael Pohoreski eb40fcadcc Merged in SL-16492 (pull request #818) 
SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for fullbrightF.glsl when rigged mesh has alpha mask.

Approved-by: Dave Parks
 2021-12-17 21:26:21 +00:00
Ptolemy 8d98804ba4 SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for fullbrightF.glsl when rigged mesh has alpha mask. 2021-12-17 13:12:41 -08:00
Andrey Kleshchev f22d659c6f SL-16517 Dragging a physic object momentarily moves it to an incorrect location. 2021-12-17 19:12:52 +02:00
Runitai Linden 92933b4252 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2021-12-17 09:27:19 -06:00
Runitai Linden dd03246735 SL-16478 Fix for octree and render batch debug display not working with rigged meshes. 2021-12-17 09:26:44 -06:00
Mnikolenko Productengine 3ac21ebbf6 SL-16454 FIXED Performance viewer login screen is black 2021-12-17 13:07:23 +02:00
Dave Houlton 0fd7d20949 DRTVWR-546 fix sUseFBO merge errors 2021-12-16 11:14:14 -07:00
Dave Houlton bebdeb430b DRTVWR-546 fix dead setting merge error 2021-12-16 10:50:49 -07:00
Dave Houlton 752bcc16fc DRTVWR-546 remove dead fxn that breaks Mac build 2021-12-16 10:20:14 -07:00
Brad Kittenbrink 1e6caa69e6 Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfa 2021-12-15 17:06:24 -08:00
Brad Kittenbrink 95e2f6286c SL-16388 Improvements to llfloatermfa.cpp from code review 2021-12-15 17:05:53 -08:00
Andrey Lihatskiy 83b4ea59fc Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
Michael Pohoreski cda75cbd74 Merged in SL-16493 (pull request #812) 
SL-16493: Fix non-fullbright partial alpha objects not being lit by sun broken in 511de439a3

Approved-by: Euclid Linden
Approved-by: Dave Parks
 2021-12-15 22:12:52 +00:00
Michael Pohoreski c15a776539 Merged DRTVWR-546 into SL-16493 2021-12-15 22:12:27 +00:00
Euclid Linden 23fc6ac098 Merged in DV546-merge-6.5.2 (pull request #814) 
DRTVWR-546 merge up to 6.5.2
 2021-12-15 22:12:26 +00:00
Ptolemy 9ac89bca2c SL-16493: Add comment about using deferred shaders even though we are in a post deferred state (forward pass rendering for transparency) 2021-12-15 14:11:02 -08:00
Andrey Kleshchev f927dfabfd SL-16532 Crash at dragConstrained 2021-12-16 00:09:18 +02:00
Dave Houlton 0952086eeb Merge updated branch 'DRTVWR-546' into DV546-merge-6.5.2 2021-12-15 15:01:59 -07:00
Runitai Linden 828e584329 SL-16487 Build fix (whoops) 2021-12-15 15:57:59 -06:00
Runitai Linden 20345827eb SL-16489 Fix for rigged attachment glow showing up near origin. 2021-12-15 15:43:23 -06:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Runitai Linden 199775b7ac Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2021-12-15 13:44:22 -06:00
Runitai Linden 8bf5597db2 SL-16487 Fix for rigged attachment bounding boxes being too tight. 2021-12-15 13:43:58 -06:00
Andrey Kleshchev 2800905ac3 Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt 
+resolved viewer-manager's inherited conflict
 2021-12-15 21:36:58 +02:00