# Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llrendertarget.cpp # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # 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 | ||