6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
790ead2ef2
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-541
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/lltracerecording.h
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2021-11-12 17:43:32 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
d06c357bab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-12 11:02:00 +01:00
a4a7a765f1
Major refactor and extension of perfdata
...
All data now collated in a separate thread via lock free queue
data for all "self" attachments collected including non-rigged
known issues:
some double counting exists
* in non rigged alpha mask, maybe elsewhere
2021-10-21 13:18:45 +01:00
3c4198e4b5
SL-15999 - noninteractive sessions should quit cleanly when they get a close message. Removed some possible crashes
2021-09-29 16:50:32 +01:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
d12305496f
DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code
2020-10-19 17:21:56 -06:00
a6058b0e9f
DRTVWR-510 remove obsolete mDebugGPU variable
2020-10-19 17:21:56 -06:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
723f1891db
Merge 6.3.1 viewer-release
2019-08-26 12:35:18 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
41ede77744
SL-10625
2019-07-24 12:52:24 -07:00
1529c16201
SL-11610
...
Revert attempted fix for 10625.
2019-07-24 10:53:04 -07:00
8d8e1831f1
Merge viewer-eep
2019-07-20 17:58:11 +02:00
dc7aa170b8
SL-11610
...
Give bake its own RT to avoid issues with sharing the water distortion map.
Use glFinish to insure RTs will be complete.
2019-07-16 14:12:37 -07:00
946da4e507
SL-10761
...
Add work-around for broken intel drivers which can't use glReadPixels from RGBA FBOs to get alpha without locking up.
2019-07-15 15:04:48 -07:00
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
1d86dcd846
SL-10625 another shot across the bow
...
Move dynamic texture update (which does local back readback work) to just before swap
which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes.
2019-07-08 10:10:22 -07:00
ecb55757be
Bring back FS:Beq code comments.
2019-07-08 11:46:27 +02:00
dd3a369372
SL-10288 comments cleanup
2019-01-03 14:30:01 +02:00
3b932c27b7
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
f9ec853f4a
Merge viewer-neko
2019-01-03 19:07:09 +01:00
76369c2463
SL-10288 comments cleanup
2019-01-03 14:30:01 +02:00
efa5f24d1b
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
103b520701
Fix copy/paste silliness
2018-12-24 00:28:17 +00:00
5acd1071e3
Various improvements to mesh uploader.
...
- Resizeable and minimizable
- higher resolution preview render
- improved 3 point lighting
- correct colorisation of degenerate triangles
- better error reporting
2018-11-23 00:45:42 +00:00
bfbcd6d169
[MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select bakes on objects. handle magic bake ids in LLViewerObject.
2018-02-28 22:14:38 -08:00
a416dee2cc
cleanup the commented out code
2017-09-13 21:27:26 -07:00
8c7edbef18
1024*1024 baking viewer updates
2017-09-06 03:24:58 -07:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
5ee461ab19
merge
2012-08-08 15:52:54 -07:00
1f234f8593
merge
2012-06-27 11:33:19 -04:00
fd578f1136
MAINT-654 Potential fix for corrupt avatar bakes on some AMD systems.
2012-06-26 15:44:02 -05:00
99c1c64aa4
SH-3172 WIP - fix
2012-06-26 16:05:03 -04:00
08a621f050
MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards.
2012-05-17 18:34:14 -05:00
8c15a7e17f
SH-2902 Fix for avatar bakes etc. getting garbage data sometimes.
2012-02-07 14:51:30 -06:00
9ea41c8094
SH-2243 No deprecated calls for the whole session.
2011-09-20 00:54:37 -05:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
c8b8b153f1
SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later).
2011-08-27 00:48:14 -05:00
db92b03691
SH-2242 Start using "no fixed function" when rendering dynamic textures.
2011-08-10 14:49:11 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
Ansariel