diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-24 09:48:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-24 09:48:04 -0400 |
| commit | c662e173ab541ffb497085e55ddfa444ab51cda6 (patch) | |
| tree | 21ef4a0264bb34b80580b135eb51cdf99c64a3f3 /indra/llappearance | |
| parent | bd08855ec5dfbb5fa1c3d74b9ff49d125c91fd61 (diff) | |
| parent | 40b4cbf2c7601cbc652a14a8973f88f06fca6805 (diff) | |
merge up latest integration repo
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llavatarappearancedefines.cpp | 1 |
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; } - |