# Conflicts: # .github/pull_request_template.md # indra/llappearance/lltexlayer.cpp # indra/llcommon/llthread.cpp # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/lldaeloader.h # indra/llprimitive/llmodel.cpp # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/settings.xml # indra/newview/llmodelpreview.cpp # indra/newview/lltoolpie.cpp # indra/newview/skins/default/xui/en/floater_model_preview.xml # indra/newview/skins/default/xui/en/panel_preferences_sound.xml |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llavatarappearance.cpp | ||
| llavatarappearance.h | ||
| llavatarappearancedefines.cpp | ||
| llavatarappearancedefines.h | ||
| llavatarjoint.cpp | ||
| llavatarjoint.h | ||
| llavatarjointmesh.cpp | ||
| llavatarjointmesh.h | ||
| lldriverparam.cpp | ||
| lldriverparam.h | ||
| lljointdata.h | ||
| lljointpickname.h | ||
| lllocaltextureobject.cpp | ||
| lllocaltextureobject.h | ||
| llpolymesh.cpp | ||
| llpolymesh.h | ||
| llpolymorph.cpp | ||
| llpolymorph.h | ||
| llpolyskeletaldistortion.cpp | ||
| llpolyskeletaldistortion.h | ||
| lltexglobalcolor.cpp | ||
| lltexglobalcolor.h | ||
| lltexlayer.cpp | ||
| lltexlayer.h | ||
| lltexlayerparams.cpp | ||
| lltexlayerparams.h | ||
| llviewervisualparam.cpp | ||
| llviewervisualparam.h | ||
| llwearable.cpp | ||
| llwearable.h | ||
| llwearabledata.cpp | ||
| llwearabledata.h | ||
| llwearabletype.cpp | ||
| llwearabletype.h | ||