diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index d60882ca1f..f50c4b8e8a 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -44,8 +44,8 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 id: py311 with: python-version: '3.11' @@ -130,12 +130,12 @@ jobs: shell: bash - name: Get the code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Checkout build vars (after the main code) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: FirestormViewer/fs-build-variables path: build-variables @@ -275,7 +275,7 @@ jobs: # fi - name: Publish artifacts if: runner.os == 'Windows' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.FS_RELEASE_TYPE }}-${{ matrix.os }}-${{ matrix.addrsize }}-${{ matrix.grid }}-artifacts.zip path: | @@ -284,7 +284,7 @@ jobs: - name: publish Linux artifacts if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.FS_RELEASE_TYPE }}-${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip path: | @@ -293,7 +293,7 @@ jobs: - name: publish MacOS artifacts if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.FS_RELEASE_TYPE }}-${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip path: | @@ -361,7 +361,7 @@ jobs: echo "FS_BUILD_WEBHOOK_URL=${FS_BUILD_WEBHOOK_URL}" >> $GITHUB_ENV - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 id: download with: path: to_deploy diff --git a/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl b/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl index d4aec3be7a..20ac01735b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl @@ -130,7 +130,7 @@ void main() break; case 2: // Blur (variable) fragColor = texture(diffuseRect, fragTC).rgb; - fragColor = mix(fragColor, blurVariable(diffuseRect, fragTC, SPHERE_PARAMS.x, BLUR_DIRECTION, effectStrength), int(effectStrength > 0)); + fragColor = mix(fragColor, blurVariable(diffuseRect, fragTC, SPHERE_PARAMS.x, BLUR_DIRECTION, effectStrength), bvec3(effectStrength > 0)); break; case 3: // ChromaticAberration fragColor = chromaticAberration(diffuseRect, fragTC, SPHERE_PARAMS.xy, SPHERE_PARAMS.zw, effectStrength); diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp index a26445b4bc..90c2967861 100644 --- a/indra/newview/llreflectionmap.cpp +++ b/indra/newview/llreflectionmap.cpp @@ -74,8 +74,11 @@ void LLReflectionMap::autoAdjustOrigin() { const LLVector4a* bounds = mGroup->getBounds(); auto* node = mGroup->getOctreeNode(); - - if (mGroup->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_VOLUME) + // Bugsplat-Fix + // if (mGroup->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_VOLUME) + const auto* partition = mGroup->getSpatialPartition(); + if (partition && partition->mPartitionType == LLViewerRegion::PARTITION_VOLUME) + // { mPriority = 0; // cast a ray towards 8 corners of bounding box diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 080f213ddd..7598a324e8 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2963,7 +2963,23 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss if(entry->isState(LLVOCacheEntry::ACTIVE)) { - ((LLDrawable*)entry->getEntry()->getDrawable())->getVObj()->loadFlags(flags); + // Bugsplat-fix + // ((LLDrawable*)entry->getEntry()->getDrawable())->getVObj()->loadFlags(flags); + // split each get...() to include a !null check + const auto *octeeEntry = entry->getEntry(); + if(octeeEntry) + { + LLDrawable * drawable = (LLDrawable *)octeeEntry->getDrawable(); + if(drawable) + { + auto vobj = drawable->getVObj(); + if(vobj) + { + vobj->loadFlags(flags); + } + } + } + // return true; } diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 21a36f110c..3a87e19470 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -913,10 +913,11 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag min_scale = llmax(min_scale*min_scale, 0.1f); vsize /= min_scale; - -#if LL_DARWIN - vsize /= 1.f + LLViewerTexture::sDesiredDiscardBias*(1.f+face->getDrawable()->mDistanceWRTCamera*bias_distance_scale); -#else +// Fix Blurry texture on Mac +// #if LL_DARWIN +// vsize /= 1.f + LLViewerTexture::sDesiredDiscardBias*(1.f+face->getDrawable()->mDistanceWRTCamera*bias_distance_scale); +// #else +// vsize /= LLViewerTexture::sDesiredDiscardBias; vsize /= llmax(1.f, (LLViewerTexture::sDesiredDiscardBias-1.f) * (1.f + face->getDrawable()->mDistanceWRTCamera * bias_distance_scale)); @@ -927,7 +928,7 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag { // further reduce by discard bias when off screen or occluded vsize /= LLViewerTexture::sDesiredDiscardBias; } -#endif +// #endif // // if a GLTF material is present, ignore that face // as far as this texture stats go, but update the GLTF material // stats diff --git a/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml index c336d30872..06d3f2eb1c 100644 --- a/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml @@ -61,7 +61,7 @@ - + diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml index 1ccf340066..8a8d3d2a36 100644 --- a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml @@ -35,6 +35,7 @@ + @@ -83,7 +84,7 @@ - +