Ansariel c29a661b22 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 ... # Conflicts: # indra/llimage/llimage.cpp # indra/llprimitive/llgltfmaterial.h # indra/llrender/llglslshader.cpp # indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl # indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl # indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl # indra/newview/gltf/accessor.cpp # indra/newview/gltf/accessor.h # indra/newview/gltf/animation.h # indra/newview/gltf/asset.cpp # indra/newview/gltf/primitive.cpp # indra/newview/gltf/primitive.h # indra/newview/gltfscenemanager.h # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llimprocessing.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewermenu.cpp # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp		2024-06-13 01:54:18 +02:00
..
StringVec.h	…
apply_test.cpp	…
bitpack_test.cpp	…
classic_callback_test.cpp	…
commonmisc_test.cpp	…
lazyeventapi_test.cpp	…
listener.h	…
llallocator_heap_profile_test.cpp	…
llallocator_test.cpp	…
llbase64_test.cpp	…
llcond_test.cpp	…
lldate_test.cpp	…
lldeadmantimer_test.cpp	…
lldependencies_test.cpp	…
llerror_test.cpp	…
lleventcoro_test.cpp	…
lleventdispatcher_test.cpp	…
lleventfilter_test.cpp	…
llexception_test.cpp	…
llframetimer_test.cpp	…
llheteromap_test.cpp	…
llinstancetracker_test.cpp	…
lllazy_test.cpp	…
llleap_test.cpp	…
llmainthreadtask_test.cpp	…
llmemtype_test.cpp	…
llpounceable_test.cpp	…
llprocess_test.cpp	…
llprocessor_test.cpp	…
llprocinfo_test.cpp	…
llrand_test.cpp	…
llsdserialize_test.cpp	…
llsingleton_test.cpp	…
llstreamqueue_test.cpp	…
llstring_test.cpp	…
lltrace_test.cpp	…
lltreeiterators_test.cpp	…
llunits_test.cpp	…
lluri_test.cpp	…
stringize_test.cpp	…
threadsafeschedule_test.cpp	…
tuple_test.cpp	…
workqueue_test.cpp	…
wrapllerrs.h	…