summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2012-09-05 17:46:11 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2012-09-05 17:46:11 -0400
commitb146490e1b46799ccb35e156b4751eddea3a23ce (patch)
tree0f197a5d97afaa566e3019043b5df488aaf03aa6 /indra/newview/llvoavatarself.h
parent2cb3b8ef6bbfa328e35b9c066f0b5c3ceebba55f (diff)
SH-3264 Worked to move over mBakedTextureDatas from LLVOAvatar to LLAvatarAppearance.
Appear to have been able to move over the parts that are common to both the backend and the viewer into LLAvatarAppearance.
Diffstat (limited to 'indra/newview/llvoavatarself.h')
-rwxr-xr-xindra/newview/llvoavatarself.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 12886d2d36..7fcab020e6 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -388,7 +388,7 @@ public:
BOOL isAllLocalTextureDataFinal() const;
- const LLViewerTexLayerSet* debugGetLayerSet(LLAvatarAppearanceDefines::EBakedTextureIndex index) const { return mBakedTextureDatas[index].mTexLayerSet; }
+ const LLViewerTexLayerSet* debugGetLayerSet(LLAvatarAppearanceDefines::EBakedTextureIndex index) const { return (LLViewerTexLayerSet*)(mBakedTextureDatas[index].mTexLayerSet); }
const std::string debugDumpLocalTextureDataInfo(const LLViewerTexLayerSet* layerset) const; // Lists out state of this particular baked texture layer
const std::string debugDumpAllLocalTextureDataInfo() const; // Lists out which baked textures are at highest LOD
LLSD metricsData();