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

69051 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Mnikolenko Productengine 3ac21ebbf6 SL-16454 FIXED Performance viewer login screen is black 2021-12-17 13:07:23 +02:00
Ansariel 1e04f580ca Build fix 2021-12-17 10:35:58 +01:00
Ansariel a0e777b17e Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-17 09:57:48 +01:00
Ansariel d392b46984 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-17 09:21:55 +01:00
Ansariel d320150178 Update German translation 2021-12-17 08:28:26 +01:00
Ansariel 94498d9a32 Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer 2021-12-17 08:27:06 +01:00
Ansariel 38d21f99fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-17 08:26:39 +01:00
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
Ansariel 5f9318dcc7 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-16 18:57:54 +01:00
Ansariel 496156073b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 18:56:31 +01: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
PanteraPolnocy 67b2971bf3 Cleanup in all other languages 2021-12-16 17:18:05 +01:00
PanteraPolnocy ab3b9d3d21 Updated Polish translation 2021-12-16 17:16:33 +01:00
Ansariel 496ea3e01c Fix fucken Python junk... 2021-12-16 16:19:08 +01:00
Ansariel 2ba4a164e2 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Python.cmake
#	indra/lib/python/indra/util/llmanifest.py
#	indra/lib/python/indra/util/test_win32_manifest.py
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lleventnotifier.cpp
#	indra/newview/llpanellandmarks.cpp
#	indra/newview/llpreviewanim.cpp
#	indra/newview/llpreviewanim.h
#	indra/newview/llviewerregion.cpp
#	indra/newview/skins/default/xui/de/menu_place_add_button.xml
#	indra/newview/skins/default/xui/it/menu_place_add_button.xml
#	indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ja/menu_place_add_button.xml
#	indra/newview/skins/default/xui/pl/menu_place_add_button.xml
#	indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ru/menu_place_add_button.xml
#	indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
#	indra/newview/viewer_manifest.py
 2021-12-16 12:32:34 +01:00
Ansariel 39f272278c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp
 2021-12-16 10:20:56 +01: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
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
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
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02: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
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
Andrey Kleshchev aa309c2eef updated viewer-manager after merge 2021-12-15 21:23:03 +02:00
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
 2021-12-15 21:16:47 +02: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