aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-06-13 13:22:19 -0500
committerJacek Antonelli2009-06-13 13:22:42 -0500
commit5fd0f5edb03dc0c65fef5898d9539d957d3e9353 (patch)
tree90c391505db16915b2ce413983eefab869692c5a /linden/indra/newview/llviewerobject.cpp
parentSecond Life viewer sources 1.23.3-RC (diff)
downloadmeta-impy-5fd0f5edb03dc0c65fef5898d9539d957d3e9353.zip
meta-impy-5fd0f5edb03dc0c65fef5898d9539d957d3e9353.tar.gz
meta-impy-5fd0f5edb03dc0c65fef5898d9539d957d3e9353.tar.bz2
meta-impy-5fd0f5edb03dc0c65fef5898d9539d957d3e9353.tar.xz
Second Life viewer sources 1.23.4-RC
Diffstat (limited to 'linden/indra/newview/llviewerobject.cpp')
-rw-r--r--linden/indra/newview/llviewerobject.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 51b3e2a..6591cd3 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -3779,6 +3779,22 @@ S32 LLViewerObject::setTETexGen(const U8 te, const U8 texgen)
3779 return retval; 3779 return retval;
3780} 3780}
3781 3781
3782S32 LLViewerObject::setTEMediaTexGen(const U8 te, const U8 media)
3783{
3784 S32 retval = 0;
3785 const LLTextureEntry *tep = getTE(te);
3786 if (!tep)
3787 {
3788 llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
3789 }
3790 else if (media != tep->getMediaTexGen())
3791 {
3792 retval = LLPrimitive::setTEMediaTexGen(te, media);
3793 setChanged(TEXTURE);
3794 }
3795 return retval;
3796}
3797
3782S32 LLViewerObject::setTEShiny(const U8 te, const U8 shiny) 3798S32 LLViewerObject::setTEShiny(const U8 te, const U8 shiny)
3783{ 3799{
3784 S32 retval = 0; 3800 S32 retval = 0;