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

1274 Commits (8ea7867528cf2c03f2fc60a361663af2a4084bfb)

Author SHA1 Message Date
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Callum Prentice ad9ed0a94d Merge with tip of Master after Viewer release 2021-06-07 18:55:00 -07:00
Andrey Lihatskiy fef6c1f51e Merge branch 'master' into DRTVWR-516-maint 2021-06-07 20:54:41 +03:00
Andrey Kleshchev d357bf7ae5 SL-14990 Turn on shader init logging after crash 2021-04-01 19:44:56 +03:00
Dave Houlton 303feae305 Merge branch 'master' v6.4.17 into DRTVWR-525 2021-03-10 09:34:16 -07: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 ec824a16d5 Merge branch 'master' into DRTVWR-516-maint 2021-03-09 21:57:53 +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
Dave Houlton 363bc9d9d0 Merge branch 'master' v 6.4.15 into DRTVWR-525 2021-03-02 14:25:36 -07:00
Andrey Lihatskiy 135d54a4ff Merge branch 'master' into DRTVWR-516-maint 2021-03-02 21:41:37 +02:00
Dave Houlton dab0948544 DRTVWR-525, improve dev's quality-of-life 2021-02-04 10:54:00 -07:00
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08:00
Dave Houlton 033d16747c DRTVWR-525 fix build error resulting from 6.4.13 merge 2021-02-01 16:25:56 -07:00
Dave Houlton f07b332ef0 Merge branch 'master' into DV525-merge-6.4.13 2021-02-01 15:59:08 -07:00
Andrey Lihatskiy cd831c4228 Merge branch 'master' into DRTVWR-516-maint 2021-02-01 22:11:04 +02:00
Ptolemy a5aac89809 SL-14035: Don't use sRGB textures when not specified 2021-01-06 18:17:56 -08: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
Dave Houlton 21e2f3e974 Merge branch 'master' 6.4.12 into DRTVWR-510 2020-11-11 15:43:06 -07:00
Callum Prentice 9b1d9150c2 Merge branch 'master' into DRTVWR-519 2020-11-11 13:22:35 -08: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
Brad Payne (Vir Linden) 9d5c64dddc SL-14264 - ViewerStats added logging of most gGLManager fields 2020-11-10 13:11:08 +00:00
Andrey Kleshchev ad6b1b0b7c SL-14150 Fix spelling 2020-10-23 09:58:17 +03:00
Andrey Kleshchev 0bf11e45ea SL-14150 Handle more cases of corrupted cache 2020-10-22 22:22:17 +03:00
Mnikolenko Productengine 83600bb16a SL-14108 FIXED Viewer crashes immediately after login 2020-10-20 14:25:54 +03:00
Dave Houlton d12305496f DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code 2020-10-19 17:21:56 -06:00
Dave Houlton a6058b0e9f DRTVWR-510 remove obsolete mDebugGPU variable 2020-10-19 17:21:56 -06:00
Dave Houlton 7cd076c796 DRTVWR-510 remove all LL_SOLARIS conditionals 2020-10-08 17:16:22 -06:00
Dave Houlton eb6c8c937e Merge branch 'master' 6.4.10 into DRTVWR-510 2020-09-29 14:02:22 -06:00
Callum Prentice 354930014b Merge with tip of Release 2020-09-28 15:56:44 -07:00
Andrey Lihatskiy 83822fd199 Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/llvocache.cpp
 2020-09-28 22:39:06 +03:00
Andrey Lihatskiy 32cb17e3bb Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	indra/newview/llgroupmgr.cpp
 2020-09-28 22:24:12 +03:00
Andrey Lihatskiy a2cb61d9f4 Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-09-28 22:08:48 +03:00
Andrey Kleshchev 177ad21ade SL-13729 Performance of LLUI and LLRender2D 2020-09-17 19:59:48 +03:00
Callum Prentice d9448c6f52 The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over 2020-09-17 09:45:06 -07:00
Callum Prentice 3fc07dea01 First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. 2020-09-16 18:53:24 -07:00
Dave Houlton 9f0da75332 Merge branch 'master' 6.4.8 into DRTVWR-497 2020-08-18 11:29:17 -06:00
Dave Houlton 4e94745139 Merge branch 'master' 6.4.8 into DRTVWR-510 2020-08-18 10:22:40 -06:00
Andrey Lihatskiy 4b1a0e51b0 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp
#	indra/newview/llviewermenufile.cpp
 2020-08-18 19:15:26 +03:00
Andrey Lihatskiy a9885029cf Merge branch 'master' into DRTVWR-507-maint 2020-08-18 19:11:34 +03: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
Dave Houlton 107a7fec34 SL-13521 add an avatar appearance light to deferred mode 2020-08-04 17:14:19 -06:00
Dave Houlton 64a9ad0f5f Merge branch 'master' v6.4.6 into DRTVWR-497 2020-07-23 12:21:18 -06:00
Dave Houlton 19d063952c Merge master 6.4.6 into DRTVWR-510 
Includes the conversion to VS2017 build tools.
 2020-07-21 11:04:56 -06:00
Andrey Lihatskiy ae48c7c8b3 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp
 2020-07-21 11:54:11 +03:00
Andrey Lihatskiy f77a30f740 Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	autobuild.xml
 2020-07-21 11:30:48 +03:00
Andrey Lihatskiy 7bbf3f5f7f Merge branch 'master' into DRTVWR-501-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp
 2020-07-20 22:24:10 +03:00
Mnikolenko Productengine 4a7cff1ce0 SL-13404 FIXED Formatted text on notecards doesn't display - Mac 2020-07-06 20:07:10 +03:00
Ptolemy 2805f38074 DRTVWR-497 Cleanup: Document which enum order comes from 2020-06-29 11:59:52 -07:00
Dave Houlton 84d3065596 SL-13281, add missing srgb->linear conversion for specular 2020-06-11 23:33:14 +03:00