diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-28 17:53:27 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-28 17:53:27 +0100 |
| commit | 82c98c72fb7b0e8f08496cbb4b79be01d660ae1b (patch) | |
| tree | c08e1b5e3c7b7881b3f792867bb65be86a28090a | |
| parent | 53bfc13ab8732633d8a53c2d3602aff3e3e652d2 (diff) | |
| parent | 93eb6cac2d89b1f9b3aabb982d6396759fd58bb7 (diff) | |
Merge from viewer-beta, minus the version number change.
| -rw-r--r-- | BuildParams | 6 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/BuildParams b/BuildParams index 7a684c61cf..898cb7bbd3 100644 --- a/BuildParams +++ b/BuildParams @@ -39,8 +39,9 @@ snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife. # ======================================== # Viewer Beta # ======================================== -viewer-beta.viewer_channel = "Second Life Beta" -viewer-beta.login_channel = "Second Life Beta" +viewer-beta.viewer_channel = "Second Life Beta Viewer" +viewer-beta.login_channel = "Second Life Beta Viewer" +viewer-beta.build_debug_release_separately = true viewer-beta.build_viewer_update_version_manager = true # ======================================== @@ -48,6 +49,7 @@ viewer-beta.build_viewer_update_version_manager = true # ======================================== viewer-release.viewer_channel = "Second Life Release" viewer-release.login_channel = "Second Life Release" +viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true # ======================================== diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 46d8f65d23..c31714de5a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6089,9 +6089,9 @@ void LLVOAvatar::updateMeshTextures() // use the last-known good baked texture until it finish the first // render of the new layerset. - const BOOL layerset_invalid = !mBakedTextureDatas[i].mTexLayerSet - || !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized() - || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable(); + const BOOL layerset_invalid = mBakedTextureDatas[i].mTexLayerSet + && ( !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized() + || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable() ); use_lkg_baked_layer[i] = (!is_layer_baked[i] && (mBakedTextureDatas[i].mLastTextureIndex != IMG_DEFAULT_AVATAR) |