diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
commit | 99c115696fadfd4197d93b9b1b6cfb2d0ffb14c5 (patch) | |
tree | 857e9b14bcdd8822a6fdd3c964602cc5adb2152c /indra/newview/llfloateravatartextures.cpp | |
parent | 2af4875309450fa3d3e266426ada12330489a8c9 (diff) | |
parent | 669953f6950000821c33e77d4c29ef0c905667f9 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloateravatartextures.cpp')
-rw-r--r-- | indra/newview/llfloateravatartextures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp index deef85cc6c..fd392d949a 100644 --- a/indra/newview/llfloateravatartextures.cpp +++ b/indra/newview/llfloateravatartextures.cpp @@ -84,7 +84,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp, { if (avatarp->isSelf()) { - const EWearableType wearable_type = tex_entry->mWearableType; + const LLWearableType::EType wearable_type = tex_entry->mWearableType; LLWearable *wearable = gAgentWearables.getWearable(wearable_type, 0); if (wearable) { @@ -175,7 +175,7 @@ void LLFloaterAvatarTextures::onClickDump(void* data) if (LLVOAvatar::isIndexLocalTexture((ETextureIndex)i)) { LLUUID id = IMG_DEFAULT_AVATAR; - EWearableType wearable_type = LLVOAvatarDictionary::getInstance()->getTEWearableType((ETextureIndex)i); + LLWearableType::EType wearable_type = LLVOAvatarDictionary::getInstance()->getTEWearableType((ETextureIndex)i); if (avatarp->isSelf()) { LLWearable *wearable = gAgentWearables.getWearable(wearable_type, 0); |