5217e6bfb7
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml |
||
|---|---|---|
| .. | ||
| tests | ||
| CMakeLists.txt | ||
| legacy_object_types.h | ||
| lldaeloader.cpp | ||
| lldaeloader.h | ||
| lllslconstants.h | ||
| llmaterial.cpp | ||
| llmaterial.h | ||
| llmaterialid.cpp | ||
| llmaterialid.h | ||
| llmaterialtable.cpp | ||
| llmaterialtable.h | ||
| llmediaentry.cpp | ||
| llmediaentry.h | ||
| llmodel.cpp | ||
| llmodel.h | ||
| llmodelloader.cpp | ||
| llmodelloader.h | ||
| llprimitive.cpp | ||
| llprimitive.h | ||
| llprimlinkinfo.h | ||
| llprimtexturelist.cpp | ||
| llprimtexturelist.h | ||
| lltextureanim.cpp | ||
| lltextureanim.h | ||
| lltextureentry.cpp | ||
| lltextureentry.h | ||
| lltree_common.h | ||
| lltreeparams.cpp | ||
| lltreeparams.h | ||
| llvolumemessage.cpp | ||
| llvolumemessage.h | ||
| material_codes.cpp | ||
| material_codes.h | ||
| object_flags.h | ||