diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-05 18:36:50 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-05 18:36:50 +0000 |
| commit | 2cb3b8ef6bbfa328e35b9c066f0b5c3ceebba55f (patch) | |
| tree | 0598fdb8113a77b2817f61ab7965f2e5e03c5756 /indra/newview/llviewerobject.cpp | |
| parent | 41301004e13bec1c74f444f42372a3a6609cb305 (diff) | |
| parent | 9f6c8459021f284011a89410a44b62f0e108352c (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
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 3bb7de74e1..f66172d924 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()) |