Ansariel
8c2deb6f8d
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/lltracker.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2022-02-22 14:52:56 +01:00
Dave Parks
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00:00
Ansariel
e7bc3f3a5a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-16 10:54:59 +01:00
Dave Parks
f47730b92c
SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-14 18:07:24 +00:00
Ansariel
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
Runitai Linden
52e1a45659
SL-16166 Optimization pass on LLRenderPass::pushBatch
2021-10-12 14:46:19 -05:00
Ansariel
c76bb4637b
Merge viewer-eep
2019-09-11 00:39:23 +02:00
Graham Linden
bfcecee33d
Fix names on sentinels to get doxygen to shaddap.
2019-08-30 14:02:25 -07:00
Ansariel
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
Kitty Barnett
4b19e4c1a5
Merged with RLVa tip
2018-06-18 01:09:54 +02:00
Kitty Barnett
fcac8d4b83
Fixed comments
...
--HG--
branch : RLVa
2018-06-17 17:24:09 +02:00
Kitty Barnett
577288d236
Merged with RLVa features & fixes
2018-05-26 18:08:53 +02:00
Rider Linden
3888de9439
Merge
2018-05-22 13:16:37 -07:00
Kitty Barnett
aa90a47a91
Added @setoverlay set of commands for a certain evil kitty
...
--HG--
branch : RLVa
2018-04-30 00:08:11 +02:00
Ansariel
bcb8dcee52
Merge viewer-neko
2018-03-13 19:48:24 +01:00
Andrey Kleshchev
4156fb832c
MAINT-6363 Normal and specular maps should not be downloaded if ALM is off
2018-03-06 12:59:32 +00:00
Graham Linden graham@lindenlab.com
6cc4a091b3
Add settings/validations for new advanced atmo settings.
2018-02-22 00:35:24 +00:00
Graham Linden graham@lindenlab.com
99b82d9449
Atmospherics WIP
...
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
Nicky
bb0329d012
Add debug floater to show how much texture memory objects in view use (per object).
2015-01-07 01:34:44 +01:00
Richard Linden
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Brad Payne (Vir Linden)
cbf24c55d5
SH-3344 WIP - additional debugging output for avatar local textures
2012-12-20 10:27:18 -05:00
Don Kjer
41301004e1
Cleanup actions from code review of llappearance with nyx
2012-09-04 22:49:26 +00:00
Don Kjer
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00