summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarappearancedefines.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-01-19 11:18:29 -0500
committerOz Linden <oz@lindenlab.com>2018-01-19 11:18:29 -0500
commita7911c43791a76f0f93f920f527970125afdc730 (patch)
tree99228045170856cf7721e83274bc9d74b45f42a4 /indra/llappearance/llavatarappearancedefines.cpp
parent444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff)
parent7acbd8ed8d73c507675d45360df07d232c431a8b (diff)
merge changes for 5.1.0-release
Diffstat (limited to 'indra/llappearance/llavatarappearancedefines.cpp')
-rw-r--r--indra/llappearance/llavatarappearancedefines.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index f1c78946a1..b5282d4f6f 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -265,4 +265,3 @@ LLWearableType::EType LLAvatarAppearanceDictionary::getTEWearableType(ETextureIn
{
return getInstance()->getTexture(index)->mWearableType;
}
-