summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-01 08:42:35 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-01 08:42:35 -0700
commit42b42826970bcb03486ce2ad10816a67eed4e373 (patch)
tree422b2b4e78d0323e504d1bdbd508f7d34738c6ed /indra/newview
parent025c8909582f59f68f786d52bea06f5a272df0b5 (diff)
Restore mismerged sunshine change
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvoavatar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index f190672847..7f7493626c 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7937,7 +7937,7 @@ const std::string LLVOAvatar::getBakedStatusForPrintout() const
++iter)
{
const ETextureIndex index = iter->first;
- const LLVOAvatarDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
if (texture_dict->mIsBakedTexture)
{
line += texture_dict->mName;