diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bc82f75221c1f10dbce213d56b5768fc538855d..5d2c75df2429602c66d09ccd9cbe630e5cd7f497 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ default: interruptible: true variables: + AUTOBUILD_BUILD_ID: $CI_PIPELINE_ID VIEWER_USE_CRASHPAD: "FALSE" VIEWER_CRASHPAD_URL: $SENTRY_DSN @@ -176,7 +177,7 @@ build:release:windows64: Authorization = "Basic $([System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("$env:AUTOBUILD_HTTP_USER`:$env:AUTOBUILD_HTTP_PASS")))"; }; Verbose = $true; }; - Push-Location .\build-linux-64\newview\Release\ + Push-Location .\build-linux-64\newview\ $FileNameLnx64 = Get-ChildItem -Path . -Name -Include Alchemy_*.tar.bz2 Invoke-WebRequest @UploadParams -InFile .\$FileNameLnx64 -Uri "${UploadDestURL}/${FileNameLnx64}" Pop-Location diff --git a/indra/newview/alaoengine.cpp b/indra/newview/alaoengine.cpp index 11c1329cae3debbf3a624a26a96f21a4ee8c5c47..8442770c2d71207a8c6fb159d24a52739677e4df 100644 --- a/indra/newview/alaoengine.cpp +++ b/indra/newview/alaoengine.cpp @@ -1741,6 +1741,12 @@ void ALAOEngine::parseNotecard(std::unique_ptr<char[]>&& buffer) std::string stateName = line.substr(1, endTag - 1); LLStringUtil::trim(stateName); + // Recognized but not currently implemented. Handled here to avoid misleading "state not found" notification. + if ("Standing mode 2" == stateName || "Standing Calm" == stateName) + { + continue; + } + ALAOSet::AOState* newState = mImportSet->getStateByName(stateName); if (!newState) { @@ -1770,6 +1776,13 @@ void ALAOEngine::parseNotecard(std::unique_ptr<char[]>&& buffer) newState->mAnimations.push_back(animation); isValid = true; } + + if ("Standing mode 1" == stateName) + { + newState->mCycle = true; + newState->mCycleTime = 30.0f; + newState->mDirty = true; + } } if (!isValid) @@ -1824,6 +1837,16 @@ void ALAOEngine::processImport(bool aFromTimer) ALAOSet::AOState* state = mImportSet->getState(index); if (!state->mAnimations.empty()) { + if (state->mCycleTime) + { + const std::string oldName = state->mName; + state->mName = llformat("%s%d",oldName + ":CT",state->mCycleTime); + } + if (state->mCycle) + { + const std::string oldName = state->mName; + state->mName = llformat("%s%s", oldName, ":CY"); + } allComplete = false; LL_DEBUGS("AOEngine") << "state " << state->mName << " still has animations to link." << LL_ENDL; diff --git a/indra/newview/alaoset.cpp b/indra/newview/alaoset.cpp index f3c9b2c0c9793ad9e5ffc74ac4da212a9a08cacc..c3598b3461fe1a5c6db3290cc162f3434680a5a3 100644 --- a/indra/newview/alaoset.cpp +++ b/indra/newview/alaoset.cpp @@ -48,7 +48,7 @@ ALAOSet::ALAOSet(const LLUUID& inventoryID) // ZHAO names first, alternate names following, separated by | characters // keep number and order in sync with the enum in the declaration static const std::array<std::string, AOSTATES_MAX> sStateNames {{ - "Standing|Stand.1|Stand.2|Stand.3", + "Standing|Standing mode 1|Stand.1|Stand.2|Stand.3", "Walking|Walk.N", "Running", "Sitting|Sit.N",