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

65950 Commits (8bdb3db63dc98b00d2ce046216f60c284f511802)

Author SHA1 Message Date
Ansariel 8bdb3db63d Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-12-16 20:05:36 +01: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
Ansariel d06070241a Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llvovolume.cpp
 2021-12-16 10:09:12 +01:00
Ansariel e8249d9e58 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llappviewer.cpp
 2021-12-16 09:52:24 +01:00
Ansariel f0ca9f9d17 Fix merge error 2021-12-16 09:51:20 +01:00
Ansariel 6663bc6f85 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llviewercontrol.cpp
 2021-12-16 09:49:35 +01:00
Ansariel 47e2173239 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/pipeline.h
 2021-12-16 08:42:54 +01: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
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
Ansariel f0304d8a5b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-15 21:14:57 +01:00
Ansariel f8afd8ac2d Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-12-15 21:13:05 +01:00
Ansariel 98c4e9d96f Update German translation 2021-12-15 21:12:40 +01:00
Ansariel a3c1080295 Merge branch 'DRTVWR-552-cache-360' of https://bitbucket.org/lindenlab/viewer 2021-12-15 21:05:24 +01:00
Zi Ree 3ecdc24bfb FIRE-11512 - Fix accelerator keys sometimes typing things into text entry fields on Linux 2021-12-15 20:45:49 +01: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
Ptolemy 6164d465af SL-16493: Fix non-fullbright partial alpha objects not being lit by sun broken in 511de439a3 2021-12-15 10:39:00 -08:00
Nat Goodspeed 0a873cd955 Increment viewer version to 6.5.2 
following promotion of DRTVWR-552
 2021-12-15 13:35:36 -05:00
Ansariel ee554834b8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-15 19:31:19 +01:00
Kitty Barnett e5f5e08de3 Update Mac FMOD Studio to v2.02.04 2021-12-15 17:27:33 +01:00
Mnikolenko Productengine 915376b379 SL-16495 FIXED Crash when unchecking "Animated Mesh" setting 2021-12-15 16:20:28 +02:00
Andrey Kleshchev 2d0d7c71e6 SL-16485 Crash at memcpyNonAliased16 2021-12-15 14:40:44 +02:00
Ansariel 41edd520b4 FIRE-31090: Fix buttons vanishing from places panel as soon as it gets opened via teleport history 2021-12-15 10:20:11 +01:00
Ansariel 049fd7f0ab Disable buttons/menu items in places/teleport history if their actions are denied due to RLVa restrictions 2021-12-15 09:49:25 +01:00
Andrey Kleshchev 18aa775e23 SL-16105 Crash at LLTrackBlenderLoopingManual's setPosition 
User opened editor, pressed play, according to logs environment wasn't loaded yet, asset had yet to arrive.
 2021-12-14 16:08:18 +01:00
Runitai Linden e3d86e4599 SL-16487 Fix for broken bounding boxes on rigged meshes (still broken, but not more broken than release). 2021-12-13 13:14:41 -06:00
Mnikolenko Productengine c21dad8207 SL-16467 FIXED "Keyboard layout" is not switched 2021-12-13 12:14:14 +02:00
Liny d548067dce Make disabled lists not jump to the top on clicking an element in them. 2021-12-12 19:24:12 -08:00
Nicky f34682962d Linux; Update FMOD Studio to 2.02.04 2021-12-12 14:04:49 +01:00
Ansariel 8ed636b3a5 Allow Shift-Tab to tab-remove in text editors 2021-12-12 00:18:01 +01:00
Ansariel 90004065e6 FIRE-31318: Fix copy&paste error 2021-12-11 23:42:45 +01:00
Ansariel 4cc5b249d8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-10 15:47:34 +01:00
Ansariel 0451952a8f Update FMOD Studio to 2.02.04 on Windows 2021-12-10 15:44:27 +01:00
Runitai Linden 7683477547 SL-16480 Followup -- fix for unintialized mRect/mClientRect and bad getClientRectInScreenSpace 2021-12-09 16:44:44 -06:00
Runitai Linden f475644bb1 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2021-12-09 14:02:05 -06:00
Runitai Linden 9689e606f4 SL-16480 Fix for window not saving its position on exit. 2021-12-09 14:01:41 -06:00
Andrey Kleshchev 0a9ade4687 SL-16479 'sloppy' precision in automated mode. 2021-12-09 21:17:57 +02:00
Euclid Linden 5501d02c41 Merged in euclid-16461 (pull request #805) 
SL-16461 disable occlusion-based reflection update

Approved-by: Dave Parks
 2021-12-09 17:51:37 +00:00
Dave Houlton d718f25f7d SL-16461 disable occlusion-based reflection update 2021-12-09 10:50:50 -07:00
Andrey Kleshchev 9e38e5a187 SL-16471 Removed unneeded MeshOpt generation method 2021-12-09 00:33:57 +02:00
Runitai Linden 1a6ef9a1fb SL-16468 Fix for crash when enabling highlight transparent (add rigged mesh support to highlight transparent). 2021-12-08 15:35:25 -06:00
Ansariel 2b1c62fb9b Kokua yoinked this? Let's change it a bit... 2021-12-08 19:33:47 +01:00