# 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 |
||
|---|---|---|
| .. | ||
| slplugin | ||
| CMakeLists.txt | ||
| llpluginclassmedia.cpp | ||
| llpluginclassmedia.h | ||
| llpluginclassmediaowner.h | ||
| llplugininstance.cpp | ||
| llplugininstance.h | ||
| llpluginmessage.cpp | ||
| llpluginmessage.h | ||
| llpluginmessageclasses.h | ||
| llpluginmessagepipe.cpp | ||
| llpluginmessagepipe.h | ||
| llpluginprocesschild.cpp | ||
| llpluginprocesschild.h | ||
| llpluginprocessparent.cpp | ||
| llpluginprocessparent.h | ||
| llpluginsharedmemory.cpp | ||
| llpluginsharedmemory.h | ||