livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llrender
History
Ansariel 2bc4fb2bf0 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llview.h
#	indra/newview/llaisapi.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterproperties.cpp
#	indra/newview/llfloaterproperties.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelmarketplaceinbox.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/llsidepanelinventory.h
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/en/sidepanel_inventory.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
#	indra/newview/skins/default/xui/en/sidepanel_task_info.xml
#	indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
 		2023-02-13 23:35:21 +01:00
..
CMakeLists.txt Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 2023-02-13 23:35:21 +01:00
llatmosphere.cpp Fixed truncation warning 2020-07-26 12:54:33 +02:00
llatmosphere.h SL-10664 2019-03-02 07:17:46 -08:00
llcubemap.cpp SL-16386 purge write-only state member LLCubeMap::mTextureCoordStage 2021-11-30 17:04:35 -07:00
llcubemap.h SL-16386 purge write-only state member LLCubeMap::mTextureCoordStage 2021-11-30 17:04:35 -07:00
llfontbitmapcache.cpp SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
llfontbitmapcache.h SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
llfontfreetype.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
llfontfreetype.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
llfontgl.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llfontgl.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
llfontregistry.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
llfontregistry.h Merge viewer-neko 2019-03-26 19:15:36 +01:00
llgl.cpp Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 22:04:20 +02:00
llgl.h Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llglcommonfunc.cpp MAINT-7213 Shared media (media as a texture) unusable with transparent mesh 2017-10-26 18:33:08 +03:00
llglcommonfunc.h Fix names on sentinels to get doxygen to shaddap. 2019-08-30 14:02:25 -07:00
llgldbg.cpp
…
llgldbg.h
…
llglheaders.h Initial merge of DRTVWR-541 into FS 2021-10-09 20:18:14 +01:00
llglslshader.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llglslshader.h SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
llglstates.h SL-9977 2018-10-29 23:02:20 +01:00
llgltexture.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-02-22 14:52:56 +01:00
llgltexture.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-02-22 14:52:56 +01:00
llgltypes.h
…
llimagegl.cpp Merge branch 'master' into DRTVWR-548-maint-N 2022-09-15 20:44:04 +03:00
llimagegl.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-02-24 12:19:28 +01:00
llpostprocess.cpp Replace GL_TEXTURE_RECTANGLE_ARB with GL_TEXTURE_RECTANGLE 2017-04-27 10:07:20 +02:00
llpostprocess.h
…
llrender.cpp Fix line widths: line widths > 1.0 are deprecated in current core profile, but not invalid; checking valid range should be sufficient if line widths > 1.0 will ever get removed in a future OGL version 2022-11-17 21:59:22 +01:00
llrender.h Manually applying SL-17473 Viewer not clearing all Vertex Buffers in some cases 2022-05-28 14:08:00 +02:00
llrender2dutils.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llrender2dutils.h Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 18:10:48 +01:00
llrendernavprim.cpp
…
llrendernavprim.h
…
llrendersphere.cpp
…
llrendersphere.h
…
llrendertarget.cpp Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-06-22 21:11:47 +02:00
llrendertarget.h SL-16928 Fix for broken bumpmaps on Intel GPUs 2022-03-04 17:05:05 -06:00
llshadermgr.cpp Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-06-22 21:11:47 +02:00
llshadermgr.h Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-20 22:35:31 +01:00
lltexture.cpp Correct EOL for last line of files. 2018-04-18 09:40:16 -07:00
lltexture.h SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
lltexturemanagerbridge.cpp SL-19134 Some texture related adjustments 2023-02-07 12:36:20 +02:00
lltexturemanagerbridge.h SL-19134 Some texture related adjustments 2023-02-07 12:36:20 +02:00
lluiimage.cpp Merge Firestorm LGPL 2019-11-15 19:05:26 +01:00
lluiimage.h SL-10566 Use vector for some high-traffic, low-item count containers instead of list. 2019-08-05 12:04:29 -07:00
lluiimage.inl Fix line-endings on new inline file. 2019-08-12 14:39:24 -07:00
llvertexbuffer.cpp Manually applying SL-17473 Viewer not clearing all Vertex Buffers in some cases 2022-05-28 14:08:00 +02:00
llvertexbuffer.h Manually applying SL-17473 Viewer not clearing all Vertex Buffers in some cases 2022-05-28 14:08:00 +02:00