diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
| commit | 1db5d35447478a74ece447297289d76bfef8c48c (patch) | |
| tree | db0b8f78344aee6ed21efd4444908c8c8d0fc7a5 /indra/newview/lltexglobalcolor.cpp | |
| parent | 4d616fdfaebca4aedce84f5d694dcd495ac4222c (diff) | |
| parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexglobalcolor.cpp')
| -rw-r--r-- | indra/newview/lltexglobalcolor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexglobalcolor.cpp b/indra/newview/lltexglobalcolor.cpp index 595b24ad47..d7840fb435 100644 --- a/indra/newview/lltexglobalcolor.cpp +++ b/indra/newview/lltexglobalcolor.cpp @@ -108,9 +108,9 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color) return new_param; } -void LLTexParamGlobalColor::onGlobalColorChanged(bool set_by_user) +void LLTexParamGlobalColor::onGlobalColorChanged(bool upload_bake) { - mAvatar->onGlobalColorChanged(mTexGlobalColor, set_by_user); + mAvatar->onGlobalColorChanged(mTexGlobalColor, upload_bake); } //----------------------------------------------------------------------------- |