summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-05 18:26:26 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-05 18:26:26 -0400
commit259857b34ee0f9cbb8af6fb66f8ac280baac7b52 (patch)
tree19c04829f2ece21ab0f5f1c63abc71a0dce24f94 /indra/newview/llviewerobject.cpp
parent201d9853f9d57efab9b819ff07745141a5265e98 (diff)
parent9f6c8459021f284011a89410a44b62f0e108352c (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp2
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())