4d0ebf6143
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewerdisplay.cpp
2023-05-17 18:02:50 +02:00
ee0b330b2d
DRTVWR-559 Decruft deprecated OpenGL flags.
2023-05-16 20:31:29 -05:00
b4fde14f09
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-01-19 23:04:50 +01:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
d3a1b88511
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-11-11 11:29:58 +01:00
e2cf375179
SL-18573 Fix for HUD text being wrong color.
2022-11-10 13:54:52 -06:00
5763aa32cc
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llsettingsvo.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
2022-10-12 16:25:18 +02:00
9448db5d4a
SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-06 18:40:01 -05:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
ac2ee57edb
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lllocationinputctrl.h
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/viewer_manifest.py
# indra/viewer_components/login/lllogin.cpp
2022-04-19 15:27:35 +02:00
3e9a13dc07
SL-17008 Viewer spams 'mSourceObject is NULL' warning
2022-03-16 18:11:44 +02:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
5fcea00c4f
SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()
2021-11-30 17:04:35 -07:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
cb135bc9e8
SL-14079 Add more logging
2021-08-18 20:31:53 +03: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
1570415819
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 13:51:44 +02:00
00764cc236
SL-14079 crash accessing LLHUDText
...
LLHUDObject has a lot of deriveds stored as LLPointer<LLHUDObject>, no-virtual destructor is unlikely to be cause of the crash, but might be related
2020-10-14 23:16:35 +03:00
98cafc31e0
SL-14079 crash accessing LLHUDText
...
LLHUDObject has a lot of deriveds stored as LLPointer<LLHUDObject>, no-virtual destructor is unlikely to be cause of the crash, but might be related
2020-10-13 09:22:36 +02:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
177ad21ade
SL-13729 Performance of LLUI and LLRender2D
2020-09-17 19:59:48 +03:00
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
1df7760d31
SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
...
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
2018-09-14 21:52:52 +01:00
abb1d8696a
Merge viewer-cougar
2018-06-25 23:00:46 +02:00
b0e5bee0b4
MAINT-8723 - Selecting mesh objects make several HUD-related items invisible
...
FIXED (from FS Ansariel patches)
2018-06-07 18:46:03 +03:00
1d6fdc9356
Disable stencil test for various HUD-related render operations
2018-06-03 16:25:37 +02:00
4503a28aee
Merged with RLVa fixes
2016-12-03 17:13:17 +01:00
7dac084924
Refactoring carousel: prefer RlvActions over RlvHandler wherever possible
...
-> RlvHandler should only deal with the actual RLV API syntax
-> RlvActions should handle all interpretation of the stored behaviour
=> the end result will make it significantly easier to finally switch over to a new syntax with the option of remaining compatible
--HG--
branch : RLVa
2016-11-20 00:46:12 +01:00
0046a76489
Merged with default tip (Revision 353c4cb529e2)
...
--HG--
branch : RLVa
2016-10-03 22:39:14 +02:00
4da402dd23
Merge viewer-bear
2016-08-21 12:39:18 +02:00
8db7540908
MAINT-6649 PRIM_TEXT/llSetText upper draw distance limit
2016-08-19 11:58:32 +03:00
093592871b
Merged with RLVa tip
2016-07-16 20:12:34 +02:00
c3eec8d391
Added @shownearby=n|y
...
--HG--
branch : RLVa
2016-07-01 20:22:39 +02:00
4b884caf43
Added @shownames:<uuid> and @shownametags:<uuid> exceptions
...
-> [FIXED] "Pay" isn't disabled on the avatar context menu when @shownames restricted
-> [CHANGED] Show a notification when the user can't offer a teleport due to an RLV restriction
--HG--
branch : RLVa
2016-06-11 22:45:42 +02:00
a21ad8481e
Merged with RLVa update tip
2016-06-24 00:48:37 +02:00
c2c8287710
Merged with default tip (Revision 59b305ccfba9)
...
--HG--
branch : RLVa
2016-03-27 15:16:11 +02:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
a60d9a3fd6
Merge LL Viewer 4.0.2
2016-03-17 19:41:04 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
9197a8652e
MAINT-6110 FIXED No hovertext (PRIM_TEXT/llSetText) on child prim
2016-03-09 15:25:58 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
51f8b1ec7b
Merge viewer-bear
2016-02-26 21:34:32 +01:00
c27f2e1912
MAINT-6110 Show hovertext on attached objects
2016-02-23 12:08:29 +02:00
35b499a0be
MAINT-6110 Show hovertext on attached objects
2016-02-23 12:08:29 +02:00
Ansariel