diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
commit | c9044c03b3157c330a0b3b640bfce6bacc0c9343 (patch) | |
tree | d22f74cf380629ef398eea71d937646bfd726a40 /indra/newview/llvoavatar.cpp | |
parent | 1786a7150e754ea10dfd5172ec2491dd67e83a9a (diff) | |
parent | 8a3384adafff1b34d5a903e4d8cfd2dabca9e243 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4cdba0fba9..e51496da06 100644..100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6627,7 +6627,7 @@ void LLVOAvatar::updateMeshTextures() if(!isSelf()) { src_callback_list = &mCallbackTextureList ; - paused = mLoadedCallbacksPaused ; + paused = !isVisible(); } std::vector<BOOL> is_layer_baked; @@ -7168,7 +7168,7 @@ void LLVOAvatar::onFirstTEMessageReceived() if(!isSelf()) { src_callback_list = &mCallbackTextureList ; - paused = mLoadedCallbacksPaused ; + paused = !isVisible(); } for (U32 i = 0; i < mBakedTextureDatas.size(); i++) |