diff options
| author | Callum Prentice <callum@gmail.com> | 2017-01-10 11:47:40 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-01-10 11:47:40 -0800 |
| commit | fed164732bbd69b22fc0219133bf4cef3deb5f2b (patch) | |
| tree | 38613151bef682103ccbe601a3c5becce1bc245d /indra | |
| parent | 4e904d615cb39c57aecc7e823844e83c6c56bf7f (diff) | |
| parent | f40bd0fac308b21319d84ee221cb8f81d369dd71 (diff) | |
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/BuildVersion.cmake | 2 | ||||
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index 6ffa698a1c..321aecf073 100644 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -54,7 +54,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n endif ("${VIEWER_VERSION_REVISION}" STREQUAL "") set(VIEWER_CHANNEL_VERSION_DEFINES - "LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\"" + "LL_VIEWER_CHANNEL=${VIEWER_CHANNEL}" "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}" "LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}" "LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}" diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 2f0b583ed2..ab6d77dd9b 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -2126,4 +2126,3 @@ LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BO } } - |