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

43160 Commits (ab02a6dfd42bb44bdfbdf5a97221c0abdfbe81e2)

Author SHA1 Message Date
Andrey Kleshchev 58ba75f6dd SL-13783 Workaround for enqueueCoprocedure() crash #2 2020-08-18 16:23:59 +03:00
Michael Pohoreski 2c964e82f5 Merged in SL-13465 (pull request #239) 
Approved-by: Dave Houlton
 2020-08-17 22:56:18 +00:00
Andrey Kleshchev fa0cc7b6d2 Merged in SL-13783 and SL-13789 2020-08-17 20:49:56 +00:00
Andrey Kleshchev 5ff63f0d7b SL-13789 Crash 'Enqueue failed' due to viewer requesting over 4K landmarks 2020-08-17 21:52:33 +03:00
Andrey Kleshchev 80fe2157fe SL-13783 Workaround for enqueueCoprocedure() crash with asset storage 2020-08-17 21:52:28 +03:00
Ptolemy f156730f3b SL-13465 Fix local scalar mix masking global mix() function. 2020-08-16 14:23:03 -07:00
Ptolemy 3192412922 SL-13465 Partially restore atmospheric effects for the moon. 2020-08-16 14:23:03 -07:00
Brad Payne (Vir Linden) cef702d0c5 SL-13705 - bug fixes and comments 2020-08-14 14:11:34 +01:00
Dave Houlton 8189c900d8 Merged in DV497-merge-6.4.7 (pull request #237) 
Merge master v6.4.7 to LMR#4 DRTVWR-497
 2020-08-13 20:20:20 +00:00
Dave Houlton 0c0ed56167 Merge branch 'master' 6.4.7 into DRTVWR-497 2020-08-13 11:09:26 -06:00
Brad Payne (Vir Linden) f28437adc7 SL-13705 - modified_strings.py handles more cases 2020-08-13 14:54:45 +01:00
Andrey Kleshchev 1f2ceb97ec SL-13583 Some behavior tweaks #2 2020-08-12 22:53:23 +03:00
Brad Payne (Vir Linden) 1f9852f04c SL-13705 - modified_strings.py added, for translation support 2020-08-12 18:27:00 +01:00
Andrey Kleshchev d240d381a2 SL-13583 Some behavior tweaks #1 2020-08-12 00:59:45 +03:00
Dave Houlton 456968de65 Merged in DV510-merge-6.4.7 (pull request #235) 
Merge master 6.4.7 into DRTVWR-510
 2020-08-11 21:10:38 +00:00
Andrey Kleshchev 777e896ee4 DRTVWR-482 Use proper reshape procedure and fix hidden borders 2020-08-11 21:28:05 +03:00
Andrey Kleshchev 3239f3518b SL-13698 Mac build fix 2020-08-11 20:43:50 +03:00
Dave Houlton 2fb998bc02 Merge branch 'master' v6.4.7 into DRTVWR-510 2020-08-11 11:14:21 -06:00
Brad Payne (Vir Linden) 59de1d58d4 SL-13705 - modified-strings.sh added, for translation support 2020-08-11 14:14:38 +01:00
Andrey Lihatskiy f29ac6757c Merge branch 'master' into DRTVWR-507-maint 2020-08-11 01:35:04 +03:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
 2020-08-11 01:34:13 +03:00
Andrey Kleshchev 2e66c406d1 SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorage 
to reflect previous commit and use correct pool size
 2020-08-11 01:20:44 +03:00
Andrey Kleshchev 1a390cb0df Merged master into DRTVWR-482 2020-08-11 00:37:42 +03:00
Andrey Lihatskiy 6544826193 Merge branch 'master' into DRTVWR-501-maint 2020-08-10 23:59:32 +03:00
Nat Goodspeed 89cde15fb8 Increment viewer version to 6.4.7 
following promotion of DRTVWR-476
 2020-08-10 16:51:50 -04:00
Mnikolenko Productengine 43941a3d87 SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
Andrey Kleshchev 8213cc896c SL-3704 Give plugins some time to terminate 
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
 2020-08-10 20:44:52 +03:00
Andrey Kleshchev 6abf2ca503 SL-13744 Updated bugsplat 
Due to some known crashes inside bugsplat and deprecated mac support
 2020-08-08 00:05:27 +03:00
Mnikolenko Productengine e33448d5eb SL-13669 updated tests 2020-08-07 19:55:18 +03:00
Andrey Kleshchev cf83b9f890 SL-13393 Update fmodstudio to 2.00.11 2020-08-07 16:08:52 +03:00
Andrey Kleshchev 1935d25c78 Revert "SL-11215: Add release notes URLs to update-related notifications." 
This reverts commit bf999f2f84 due to revert of updater, this will be moved to separate 'epic' instead
 2020-08-06 20:06:02 +03:00
Andrey Kleshchev c27e207033 SL-13737 Crash when cleaning up uninitialized ndof device 2020-08-06 17:46:53 +03:00
Andrey Kleshchev 00acc562f9 Revert commit bbb16ff97c. 
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
 2020-08-05 22:36:00 +03:00
Dave Houlton b55be11900 Merged in euclid-13521 (pull request #228) 
SL-13521 Add avatar appearance lighting to deferred lighting path

Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
 2020-08-05 18:31:32 +00:00
Dave Houlton 92ee1be5cf SL-13521, clang-format LLRender::syncLightState() (whitespace) 2020-08-05 12:30:24 -06:00
Dave Houlton 8b314a646f SL-13521, stamp out some remaining hard-coded 8s 2020-08-05 12:05:23 -06:00
Andrey Kleshchev 59b9894d4c SL-13719 One more exit crash for asset storage 2020-08-05 20:07:19 +03:00
Andrey Kleshchev bbb16ff97c SL-13704 Move link generation into getReleaseNotes() 2020-08-05 20:07:19 +03:00
Andrey Lihatskiy 07c7506b1b Merge branch 'DRTVWR-476' into DRTVWR-501-maint 2020-08-05 09:59:41 +03:00
Dave Houlton 087c294e01 SL-13521, clang-format renderDeferredLighting() for consistency 2020-08-04 17:34:43 -06:00
Dave Houlton 107a7fec34 SL-13521 add an avatar appearance light to deferred mode 2020-08-04 17:14:19 -06:00
Mnikolenko Productengine 357edecd9b SL-13669 Change inventory cache to use a standard LLSD format 2020-08-04 15:30:20 +03:00
Andrey Kleshchev 40b5babccd updated dullahan links (merge from DRTVWR-476) 2020-08-03 21:05:00 +03:00
Mnikolenko Productengine 7a9a114e16 SL-13698 FIXED crash on model upload 2020-08-03 19:14:09 +03:00
Andrey Lihatskiy af7ff3d99f Updated LLCA to codeticket build 546021 2020-08-03 13:42:08 +03:00
Andrey Kleshchev e8422ec9d7 SL-13626 Fixed spelling error 2020-07-31 00:14:14 +03:00
Andrey Kleshchev 135a85ec62 SL-13626 Fix asset storage coroutine shutdown 2020-07-30 21:07:35 +03:00
Andrey Kleshchev 8103d13047 SL-13704 Release notes link not loading in ToolsUpdate2 release 2020-07-30 14:43:27 +03:00
Andrey Kleshchev 6bafe47e5c Revert part of SL-11216 due to reverting VVM 
This reverts commit 31d9930a0f.
 2020-07-30 14:36:39 +03:00
Andrey Kleshchev a2b5f44b35 Merge branch 'DRTVWR-476' into DRTVWR-501-maint 2020-07-29 21:49:03 +03:00