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

593 Commits (f836194516d3ddf0bb8d63bf4b58b6add6387d2d)

Author SHA1 Message Date
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Rye Mutt 22dc6de993 Fix trivial memory leaks in note card processing, chat history, and task inventory 2022-10-19 19:41:46 -04:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Mnikolenko Productengine 43a9b3e4e4 SL-17990 Give user a popup warning when they attach a rigged mesh object to an HUD 2022-08-19 20:19:23 +03: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 Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-18 20:43:49 +03:00
Andrey Kleshchev 625cc84ec0 SL-16865 llStopSound() does not stop sound if it is out of cutoff radius 2022-03-21 09:44:55 +02:00
Andrey Kleshchev 3e9a13dc07 SL-17008 Viewer spams 'mSourceObject is NULL' warning 2022-03-16 18:11:44 +02:00
Mnikolenko Productengine d91606b354 Merge branch 'master' into DRTVWR-544-maint 2021-12-20 15:36:23 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Kleshchev 875e502cc9 SL-13867 Developer ability to select and reposition multiple avatars 2021-11-09 19:05:24 +02: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
Brad Payne (Vir Linden) a184a0fbee SL-15999 - noninteractive mode: create minimal objects,load no textures 2021-09-28 20:10:06 +01:00
Brad Payne (Vir Linden) c10d601ce8 SL-15999 - track --noninteractive state with gNonInteractive flag 2021-09-20 13:19:20 +01:00
Brad Payne (Vir Linden) 0918958507 SL-15999 - disable various types of loading in noninteractive mode 2021-09-17 16:45:56 +01:00
Callum Prentice 0c89e67eb5 DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one. 2021-08-20 08:28:48 -07:00
Dave Houlton 7199ce4514 SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks. 
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef.
 2021-05-26 10:57:39 -06:00
Andrey Kleshchev 5691d302ef SL-12069 Issues with bakes-on-mesh and alpha modes 2020-12-10 23:17:07 +02:00
Brad Payne (Vir Linden) 2c2578213e SL-14264 - BOM texture 2020-11-04 18:32:26 +00:00
Dave Houlton 9f0da75332 Merge branch 'master' 6.4.8 into DRTVWR-497 2020-08-18 11:29:17 -06:00
Andrey Lihatskiy 8b8a57a977 SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster check 2020-05-19 19:56:59 +03:00
Brad Payne (Vir Linden) b654330f51 SL-12896 - BOM texture settings 2020-05-01 16:55:34 +03:00
Andrey Lihatskiy d34f95ab97 Merge branch 'master' into DRTVWR-497 2020-02-25 17:03:09 +02:00
Andrey Lihatskiy fa39ff67f0 Merge branch 'master' into DRTVWR-497 2020-02-06 21:31:34 +02:00
Andrey Lihatskiy b304adc02e Merge branch 'master' into DRTVWR-499 2020-01-28 21:42:31 +02:00
andreykproductengine c3d706be9e SL-12537 Fixed crash when the box with 'script' moves between two regions 2020-01-13 17:35:30 +02:00
AndreyL ProductEngine 2076f4af0f Merged in viewer-release 2020-01-06 20:28:37 +02:00
AndreyL ProductEngine 91fa31c065 Downstream merge from lindenlab/viewer-serval 2019-11-12 04:24:35 +02:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
AndreyL ProductEngine 4dd3d230ec Merged in lindenlab/viewer-release 2019-11-14 23:44:45 +02:00
andreykproductengine a4199b3e3c SL-12026, SL-1232 and SL-11614 2019-10-25 18:12:47 +03:00
AndreyL ProductEngine cd895d6e58 Merged in lindenlab/viewer-bear 2019-09-05 21:55:56 +03:00
andreykproductengine 607f346993 SL-9116 Implemented sound cut-off for llSetSoundRadius 2019-10-07 20:37:07 +03:00
andreykproductengine 23acff80c0 SL-11657 Further improvements 2019-08-29 22:15:54 +03:00
andreykproductengine e439f0366f Merge from lindenlab/viewer-release 2019-08-29 15:43:02 +03:00
andreykproductengine 301c5ae4e2 SL-11657 Separated expected from current inventory serial for better sync and to fix partial loads 2019-07-31 19:10:03 +03:00
andreykproductengine 87be5f7997 SL-4150 Rename htonmemcpy 2019-07-24 16:58:24 +03:00
andreykproductengine acf592419b DRTVWR-493 LLFollowCamMgr to singleton 2019-06-19 16:52:44 +03:00
Anchor 504a138cb1 Merge 2019-05-10 12:22:29 -06:00
Anchor f9f129f93d Merge 2019-04-30 15:49:03 -06:00
Anchor 56bf3287b8 Merge 2019-01-29 21:38:05 -08:00
Brad Payne (Vir Linden) b417be1781 SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue. 2019-01-08 21:28:47 +00:00
Brad Payne (Vir Linden) 4316f1d322 SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue. 2019-01-08 21:28:47 +00:00
andreykproductengine 80054757ed SL-1481 Time limit should be per object 2018-12-13 00:10:52 +02:00
andreykproductengine 4c92c7b2d0 SL-1481 Don't predict region crossings over a second 2018-12-04 17:52:46 +02:00
Anchor d4abdf3560 fix typo 2018-11-29 23:19:31 -08:00
Anchor 9b364bf703 [SL-10079] - Bom handling for animated objects 2018-11-28 16:01:36 -08:00
Anchor 014480a79b Merge 2018-11-28 15:16:01 -08:00
AndreyL ProductEngine 39652180ae Merged in lindenlab/axon 2018-11-14 16:20:05 +02:00