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

225 Commits (0a0e2fe93eb37481f5dab31e945f46de2f3f2d42)

Author SHA1 Message Date
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy 97552d2e75 SL-16606: Add profiler category SHADER 2022-01-14 11:50:20 -08:00
Ptolemy 2178d9fa57 SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
Ansariel d881fa40d3 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-20 22:35:31 +01:00
Nat Goodspeed 106d52c6ee SL-16202: Instantiate LLSimpleton::sInstance generically 
instead of requiring a separate declaration for each subclass.

The previous way produces errors in clang.

(cherry picked from commit 8458ad8890)
 2021-11-19 14:53:12 -05:00
Ansariel c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Dave Houlton 029b41c041 Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread" 
This reverts commit 5188a26a85, reversing
changes made to 819088563e.
 2021-11-15 09:25:35 -07:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2021-11-12 17:31:39 +01:00
Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	.gitignore
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llerror.cpp
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llprimitive/llmodel.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llskinningutil.cpp
#	indra/newview/llskinningutil.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llteleporthistory.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/llvovolume.cpp
 2021-11-12 15:21:52 +01:00
Nat Goodspeed 8458ad8890 SL-16202: Instantiate LLSimpleton::sInstance generically 
instead of requiring a separate declaration for each subclass.

The previous way produces errors in clang.
 2021-11-04 16:40:05 -04:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Dave Parks d2dce17803 SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead. 2021-10-19 02:26:41 +00:00
Ansariel 4c4dfb682a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 13:35:31 +02:00
Andrey Lihatskiy 2ded530f93 Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappcorehttp.cpp
#	indra/newview/llappcorehttp.h
 2021-07-19 22:20:45 +03:00
Ansariel 7b5f815b94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-27 15:01:27 +02:00
Ansariel 9563ab543b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 11:56:38 +02:00
Andrey Lihatskiy 7f19c512c9 Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
 2021-06-25 00:54:35 +03:00
Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvoicevivox.cpp
 2021-06-25 00:51:02 +03:00
Ansariel 6b71b19150 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-05-31 10:20:00 +02:00
Andrey Kleshchev cfb6ca569b SL-15168 Viewer side functionality for guidebook window opening 2021-05-06 02:46:42 +03:00
Ansariel 7f91fa0b40 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 13:15:10 +02:00
Ansariel 8afe22531d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 23:42:57 +02:00
Andrey Kleshchev 0a77c80908 SL-15152 Crashfix: Do not update environments when quiting 2021-04-24 22:32:10 +02:00
Ansariel 584ec4b4cc Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-22 07:31:19 +02:00
Andrey Kleshchev 766ba20028 SL-15152 Crashfix: Do not update environments when quiting 2021-04-21 18:28:32 +03:00
Ansariel db72dc7d0f Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-02 19:33:18 +02:00
Andrey Kleshchev c0f28ae362 SL-14927 Some avatar names not resolving 2021-03-18 23:01:04 +02:00
Ansariel d36f1c75ad Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-03 15:08:10 +01:00
Andrey Kleshchev 14826e17dc SL-14654 [EEP] Aplying settings locally now is instant 
The 1 second fade makes it harder to compare different settings.
 2021-02-25 23:48:48 +02:00
Ansariel 91346628f6 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-02-19 09:02:07 +01:00
Andrey Kleshchev 18717562ee SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5 2021-02-19 00:05:52 +02:00
Ansariel 78daeae740 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-02-15 10:22:20 +01:00
Andrey Kleshchev 199f82786e SL-14675 Position changes shouldn't cause additional blends when environment isn't ready 2021-02-09 19:02:22 +02:00
Andrey Kleshchev fff8ab23a8 SL-14675 Teleporting to a new region can load the wrong EEP environment layer 2021-02-09 17:48:28 +02:00
Ansariel 23693c23a7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 23:50:45 +01:00
Ansariel 2057fa9716 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 18:10:48 +01:00
Andrey Lihatskiy f047e2236c Merge branch 'master' into DRTVWR-522-maint 2021-02-01 22:14:56 +02:00
Andrey Lihatskiy cd831c4228 Merge branch 'master' into DRTVWR-516-maint 2021-02-01 22:11:04 +02:00
Ansariel 339c3c5df4 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-18 18:55:37 +01:00
Ansariel fd290b8fdf Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-17 13:31:21 +01:00
Andrey Kleshchev dec231827b SL-14543 Fix reason in environments 'settings couldn't be applied' error 2020-12-13 13:32:20 +02:00
Andrey Kleshchev d561756d58 SL-14497 Unblocking does not remove voice block 2020-12-08 23:25:34 +02:00
Ansariel 4fd188150b Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-13 18:20:46 +01:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
 2020-11-13 18:26:56 +02:00
Ansariel caf7f6c1d2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:53:39 +01:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
 2020-11-11 22:14:24 +02:00
Ansariel 1570415819 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 13:51:44 +02:00
Ansariel 32b5aa20c3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-14 23:48:24 +02:00
Ansariel b12a9b89eb Don't need those... 2020-10-14 22:19:18 +02:00