diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-15 17:07:10 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-15 17:07:10 -0400 |
commit | 97106c2dea855e7a7a6378e0b6971d7a8226f1f6 (patch) | |
tree | b1cc26bc18f8ec28fba94e0f91035bfb73d96452 /indra/newview/llvoavatar.cpp | |
parent | 981190cf3151f436d370b841b1baa5a2a607b94d (diff) | |
parent | f2eef652063f7f2aee7296ff41cf5d34272cc12b (diff) |
merge changes for DRTVWR-194
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 c0ef1d7a4b..366b6004be 100644..100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6676,7 +6676,7 @@ void LLVOAvatar::updateMeshTextures() if(!isSelf()) { src_callback_list = &mCallbackTextureList ; - paused = mLoadedCallbacksPaused ; + paused = !isVisible(); } std::vector<BOOL> is_layer_baked; @@ -7221,7 +7221,7 @@ void LLVOAvatar::onFirstTEMessageReceived() if(!isSelf()) { src_callback_list = &mCallbackTextureList ; - paused = mLoadedCallbacksPaused ; + paused = !isVisible(); } for (U32 i = 0; i < mBakedTextureDatas.size(); i++) |