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

602 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
 2022-09-16 21:07:39 +03:00
Andrey Kleshchev 189723fd46 SL-18161 Properly list pbr material folder 2022-09-15 21:38:38 +03:00
Andrey Kleshchev 069304ca39 Merge branch 'master' (DRTVWR-543) into DRTVWR-559 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llgl.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llvovolume.cpp
 2022-06-29 21:23:23 +03:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Mnikolenko Productengine 1559ad4792 SL-17649 Icon for Material type in Inventory 2022-06-24 13:09:24 +03:00
Dave Parks 929abcd296 SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager 2022-06-10 16:36:38 -05:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	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 02:51:33 +03:00
Brad Kittenbrink cc04903379 Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging 2022-04-28 14:05:49 -07:00
Brad Kittenbrink c9ef206e39 Beginning viewer side work for SL-17198 new asset and inventory types for Materials 2022-04-28 13:08:37 -07:00
Dave Houlton b08742d0b3 Add a (broken) material upload handler fxn 2022-04-28 11:53:43 -06:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	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-01 13:41:42 +02:00
Nicky 35cec6e3ad Initialize PODs with 0 and not leave anyting to chance. 2022-02-28 22:20:41 +01:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00
Ptolemy 2178d9fa57 SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08: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
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07: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
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
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
Andrey Lihatskiy 203ea3a70a Merge branch 'c++17' into DRTVWR-522-maint 2021-08-27 19:24:05 +03: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
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
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
Andrey Lihatskiy 2265efdaf3 Merge branch 'master' into DRTVWR-527-maint 2021-03-09 22:00:33 +02:00
Andrey Lihatskiy 19ff86fabd Merge branch 'master' into DRTVWR-522-maint 2021-03-09 22:00:08 +02:00
Andrey Lihatskiy ec824a16d5 Merge branch 'master' into DRTVWR-516-maint 2021-03-09 21:57:53 +02:00
Andrey Lihatskiy a68c527eae Merge branch 'master' into DRTVWR-518-ui 2021-03-09 21:55:37 +02:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Andrey Lihatskiy 2172a6102c Merge branch 'master' into DRTVWR-527-maint 2021-03-02 21:43:01 +02:00
Andrey Lihatskiy be83a004db Merge branch 'master' into DRTVWR-522-maint 2021-03-02 21:42:51 +02:00
Andrey Lihatskiy 9c8bc82ce6 Merge branch 'master' into DRTVWR-518-ui 2021-03-02 21:41:46 +02:00
Andrey Lihatskiy 135d54a4ff Merge branch 'master' into DRTVWR-516-maint 2021-03-02 21:41:37 +02:00