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

722 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Ansariel 4d5b5a5ae3 Enable c++17 since it seems LL is hesitant to finally do it... 2022-08-11 21:56:48 +02:00
Ansariel fc11575657 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 20:28:29 +02:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02:00
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 11:41:45 +02:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 2022-04-19 13:21:52 +02:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-02 10:12:19 +01:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Nicky 35cec6e3ad Initialize PODs with 0 and not leave anyting to chance. 2022-02-28 22:20:41 +01:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy 2178d9fa57 SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
Ansariel f46a15b3f3 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-11 15:04:11 +01:00
Mnikolenko Productengine 4966a66219 SL-16297 Init mObscureMOAP flag 2021-12-20 16:26:11 +02:00
Mnikolenko Productengine d91606b354 Merge branch 'master' into DRTVWR-544-maint 2021-12-20 15:36:23 +02:00
Mnikolenko Productengine 2112abac1b SL-16297 Support the parcel obscure_moap flag. 2021-12-17 18:13:20 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07: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
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
Ansariel f00647b6fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01:00
Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519 
# Conflicts:
#	README.md
 2021-11-16 01:21:05 +02:00
Andrey Lihatskiy f9373a9b4e Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp
 2021-11-16 00:54:53 +02: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
Ptolemy 1be8a8d10b Fix merge conflict 2021-10-29 15:11:42 -07: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
Ptolemy ad91d0fd92 SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated 2021-10-27 10:05:13 -07:00
Michael Pohoreski aa7ca0aea1 Merged in SL-16127 (pull request #741) 
SL-16127

Approved-by: Euclid Linden
Approved-by: Dave Parks
 2021-10-27 15:59:53 +00:00
Ptolemy a172c9d9cf SL-16127: Replace slow getLightTransmittance with faster version 2021-10-21 16:46:06 -07: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 160f44375e Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-10-12 12:59:35 +02:00
Andrey Lihatskiy adcd08fbf4 Revert "Merge branch 'c++17' into DRTVWR-522-maint" 
This reverts commit 203ea3a70a, reversing
changes made to 8e3f077886.

# Conflicts:
#	indra/newview/llmachineid.cpp
 2021-09-28 19:22:18 +03:00
Ansariel f2cd97a055 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-31 14:49:52 +02:00
Andrey Lihatskiy 203ea3a70a Merge branch 'c++17' into DRTVWR-522-maint 2021-08-27 19:24:05 +03:00
Ansariel 2253723705 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 14:13:23 +02:00
Ansariel 4c4dfb682a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 13:35:31 +02:00
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Andrey Lihatskiy 9873e7bba9 Merge branch 'master' into DRTVWR-527-maint 2021-07-19 22:22:32 +03: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
Nat Goodspeed 2e790e9b72 DRTVWR-538: Merge branch 'master' into c++17 2021-06-29 10:48:02 -04:00
Ansariel 44d78f3dbe Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-27 16:18:42 +02: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 0ca16a1f95 Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	indra/newview/llinventorypanel.cpp
 2021-06-25 01:02:04 +03: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
Callum Prentice 57da3e609f Merge branch 'master' into DRTVWR-519 2021-06-24 14:35:24 -07:00
Nat Goodspeed 26fb5d7af7 SL-15241: Tweak viewer sources to permit compiling on Mac with C++17. 2021-05-07 20:32:04 -04:00
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00