diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-05 18:23:31 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-05 18:23:31 +0000 |
| commit | 9f6c8459021f284011a89410a44b62f0e108352c (patch) | |
| tree | 00f3ef34008c4d10ae5fdb229192731b94a059ad /indra/newview/llviewerobject.cpp | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
Merge viewer-development -> VirLinden/sunshine
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 0bf039224c..58f8932cc4 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4097,7 +4097,7 @@ S32 LLViewerObject::setTETextureCore(const U8 te, const LLUUID& uuid, LLHost hos return retval; } - +//virtual void LLViewerObject::changeTEImage(S32 index, LLViewerTexture* new_image) { if(index < 0 || index >= getNumTEs()) |