diff options
| author | Jonathan Goodman <geenz@geenzo.com> | 2012-09-09 21:03:06 -0400 |
|---|---|---|
| committer | Jonathan Goodman <geenz@geenzo.com> | 2012-09-09 21:03:06 -0400 |
| commit | 7d8c94fcde371d691b54adb44479d0050fb8465c (patch) | |
| tree | fcc5cf154a74b05cf54c190a2419db862ccc9b36 /indra/newview/llviewerobject.cpp | |
| parent | 9593e85e144e2141c92abe597653851852501060 (diff) | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
Merge with latest viewer-dev.
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 b2e6dc4571..444bbb2776 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4080,7 +4080,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()) |