diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-06 03:04:10 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-06 03:04:10 +0000 |
| commit | 2e933100bb6bf27c0307dc6831142dcc0860fb7b (patch) | |
| tree | 27de2cf2d447b693ae2b20560d1432ca8324defd /indra/newview/llvoavatarself.h | |
| parent | 85d0bcc0630bfbf8b50be3a47a113c4f8d6ec9df (diff) | |
| parent | b146490e1b46799ccb35e156b4751eddea3a23ce (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 2fe960cd1e..75c2743ab0 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -389,7 +389,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(); |