aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/newview/llviewerobject.cpp
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/newview/llviewerobject.cpp')
-rw-r--r--linden/indra/newview/llviewerobject.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 056475b..9c895cb 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -3650,7 +3650,12 @@ S32 LLViewerObject::setTETexture(const U8 te, const LLUUID& uuid)
3650} 3650}
3651 3651
3652 3652
3653S32 LLViewerObject::setTEColor(const U8 te, const LLColor4 &color) 3653S32 LLViewerObject::setTEColor(const U8 te, const LLColor3& color)
3654{
3655 return setTEColor(te, LLColor4(color));
3656}
3657
3658S32 LLViewerObject::setTEColor(const U8 te, const LLColor4& color)
3654{ 3659{
3655 S32 retval = 0; 3660 S32 retval = 0;
3656 const LLTextureEntry *tep = getTE(te); 3661 const LLTextureEntry *tep = getTE(te);
@@ -4857,7 +4862,7 @@ void LLViewerObject::dirtySpatialGroup() const
4857 } 4862 }
4858} 4863}
4859 4864
4860void LLViewerObject::dirtyMesh() const 4865void LLViewerObject::dirtyMesh()
4861{ 4866{
4862 if (mDrawable) 4867 if (mDrawable)
4863 { 4868 {