ec824a16d5
Merge branch 'master' into DRTVWR-516-maint
2021-03-09 21:57:53 +02:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
135d54a4ff
Merge branch 'master' into DRTVWR-516-maint
2021-03-02 21:41:37 +02:00
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08:00
cd831c4228
Merge branch 'master' into DRTVWR-516-maint
2021-02-01 22:11:04 +02:00
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
9b1d9150c2
Merge branch 'master' into DRTVWR-519
2020-11-11 13:22:35 -08:00
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
9d5c64dddc
SL-14264 - ViewerStats added logging of most gGLManager fields
2020-11-10 13:11:08 +00:00
ad6b1b0b7c
SL-14150 Fix spelling
2020-10-23 09:58:17 +03:00
0bf11e45ea
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:22:17 +03:00
83600bb16a
SL-14108 FIXED Viewer crashes immediately after login
2020-10-20 14:25:54 +03:00
354930014b
Merge with tip of Release
2020-09-28 15:56:44 -07:00
83822fd199
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/llvocache.cpp
2020-09-28 22:39:06 +03:00
32cb17e3bb
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/newview/llgroupmgr.cpp
2020-09-28 22:24:12 +03:00
a2cb61d9f4
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
177ad21ade
SL-13729 Performance of LLUI and LLRender2D
2020-09-17 19:59:48 +03:00
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
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
9f0da75332
Merge branch 'master' 6.4.8 into DRTVWR-497
2020-08-18 11:29:17 -06:00
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
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
92ee1be5cf
SL-13521, clang-format LLRender::syncLightState() (whitespace)
2020-08-05 12:30:24 -06:00
8b314a646f
SL-13521, stamp out some remaining hard-coded 8s
2020-08-05 12:05:23 -06:00
107a7fec34
SL-13521 add an avatar appearance light to deferred mode
2020-08-04 17:14:19 -06:00
64a9ad0f5f
Merge branch 'master' v6.4.6 into DRTVWR-497
2020-07-23 12:21:18 -06:00
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
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
7bbf3f5f7f
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
4a7cff1ce0
SL-13404 FIXED Formatted text on notecards doesn't display - Mac
2020-07-06 20:07:10 +03:00
2805f38074
DRTVWR-497 Cleanup: Document which enum order comes from
2020-06-29 11:59:52 -07:00
84d3065596
SL-13281, add missing srgb->linear conversion for specular
2020-06-11 23:33:14 +03:00
372ed555ed
SL-13348 Thread crashing singleton #2
...
Reverted LLImage to singleton conversion
2020-05-29 21:53:43 +03:00
663489493e
SL-12970 Fixed char length crash
2020-05-07 21:31:55 +03:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
30234c508b
Merge branch 'master' into DRTVWR-507-maint
2020-05-05 01:40:40 +03:00
6bd9fe4233
Merge branch 'master' into DRTVWR-497
2020-05-04 23:36:10 +03:00
a11c406492
SL-13121 fixed typo error
2020-04-29 12:45:06 +03:00
94dc8f12f8
Merge branch 'master' into DRTVWR-507-maint
2020-04-27 15:16:21 +03:00
abe5cc5787
Fix for 'release' configuration
...
llassert is not used in 'release' configuration and build fails due to unused tex_index
2020-04-21 10:32:45 +03:00
278853824d
Fixed merge conflict and restored SL-1130
2020-04-20 21:56:21 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
af7563968c
SL-10449: Put first shader error on new line for readability
2020-04-07 16:22:25 -07:00
e4f72db20d
SL-10449: Add dumping of shader to log file
2020-04-07 16:21:39 -07:00
0b717e2d1a
SL-10449 Cleanup dumping shader without LOG spam on every line when it fails to compile/link
2020-04-07 14:22:24 -07:00
4051f5754a
SL-10449 Fix off-by-one line numbers when dumping shader that failed to compile/link
2020-04-07 14:07:45 -07:00
29fec00f3c
SL-12775 Run at high performance AMD gpu
2020-04-03 19:40:55 +03:00
126b91f8ee
DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopy
2020-03-26 10:24:25 -06:00
30fa249664
DRTVWR-476: Fix glVertexAttrib{IPointer,PointerARB}() OpenGL calls.
...
VS 2017 complains about the same thing that clang does: casting S32 to GLvoid*
can't possibly produce a valid pointer value because S32 can't fit a whole
64-bit pointer. To appease it, not only must we use reinterpret_cast, but we
must first cast S32 to intptr_t and then reinterpret_cast THAT.
2020-03-25 16:12:46 -04:00
Andrey Lihatskiy