diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2012-12-05 17:09:38 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2012-12-05 17:09:38 -0700 |
commit | 1273dbfdd9f2a3fa027e6f05c8f811d9fe146ff4 (patch) | |
tree | 20e7062f4b2fbec65e8a74e9e30674d0cc8afc04 | |
parent | 1f228c22281530a44cfa87a518ec3c1ce54f01d6 (diff) | |
parent | aeef6cba025a37a01056c7061105ae0147420a6c (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
-rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b1a60197a2..dea76555ce 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3282,6 +3282,12 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */) iter != mChildList.end(); iter++) { LLViewerObject* child = *iter; + + if(child == gAgentAvatarp) + { + //no need to boost self avatar textures when sit. + continue; + } child->boostTexturePriority(); } } |