From 0e40016e63c637a632f693002ef155ec2e344e32 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 21 Dec 2018 17:27:30 +0100 Subject: [PATCH 01/15] FIRE-23315: Angle Cone particles are rotated by pi/2 when previewed in particle editor --- indra/newview/particleeditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp index 14d0800537..12f2963319 100644 --- a/indra/newview/particleeditor.cpp +++ b/indra/newview/particleeditor.cpp @@ -301,6 +301,7 @@ void ParticleEditor::onParameterChange() if (mWindCheckBox->getValue().asBoolean()) flags |= LLPartData::LL_PART_WIND_MASK; if (mRibbonCheckBox->getValue().asBoolean()) flags |= LLPartData::LL_PART_RIBBON_MASK; mParticles.mPartData.setFlags(flags); + mParticles.setUseNewAngle(); mParticles.mTargetUUID = mTargetKeyInput->getValue().asUUID(); From 381c5605c90bf0d452586c868308bbd38eed2efc Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 22 Dec 2018 16:14:44 -0600 Subject: [PATCH 02/15] Yet Another Bloody KDU Update for macOS. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 7470871fa1..b835a43a85 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1976,9 +1976,9 @@ archive hash - 1b87073540bf081136e60777d99f09f2 + 9a08c678a8c6c3c10bb913219b7931b6 url - file:///opt/firestorm/kdu-7.A.5-darwin-182950050.tar.bz2 + file:///opt/firestorm/kdu-7.A.6-darwin-183562147.tar.bz2 name darwin @@ -1988,9 +1988,9 @@ archive hash - 1b87073540bf081136e60777d99f09f2 + 9a08c678a8c6c3c10bb913219b7931b6 url - file:///opt/firestorm/kdu-7.A.5-darwin-182950050.tar.bz2 + file:///opt/firestorm/kdu-7.A.6-darwin-183562147.tar.bz2 name darwin64 From d8911847d166c4cfe93255b6be5176ab7f8f42e7 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 22 Dec 2018 16:21:59 -0600 Subject: [PATCH 03/15] Yet Another Bloody FMOD Studio Update for macOS. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index b835a43a85..b9d946e064 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -952,11 +952,11 @@ archive hash - e137cd0eacda5df6204150b3bb51a971 + 177f3e948368aa09803ffae0884acc12 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-1.10.09-darwin-183011234.tar.bz2 + file:///opt/firestorm/fmodstudio-1.10.10-darwin-183562214.tar.bz2 name darwin From 33a46c427b1e21b1bc7ee110d4bd1d86589521c1 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 23 Dec 2018 16:09:13 +0100 Subject: [PATCH 04/15] FIRE-21711: Add shortcut Alt-Shift-R for Refresh Attachments option --- indra/newview/skins/default/xui/en/menu_viewer.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index a797343b7b..0c4e464a94 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -276,7 +276,8 @@ + name="Refresh Attachments" + shortcut="alt|shift|R"> From 320e54c98e1fc63de8a2515bfc284967a8adac2f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 23 Dec 2018 23:59:52 +0100 Subject: [PATCH 05/15] Ogg Vorbis update for Linux; Patch by mygoditsfullofstars --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index b9d946e064..561e6f0743 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2832,9 +2832,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ee185657aed3a7fcabcd9a1335a6050b + 0d3db04b9b10085b100b345c68381cb0 url - http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.180871245-linux-180871245.tar.bz2 + http://downloads.phoenixviewer.com/ogg_vorbis-1.3.3-1.3.6.183570207-linux-183570207.tar.bz2 name linux @@ -2844,9 +2844,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ec5fd10d3a504e528b61d339522ca0f9 + 5e23c312d37367bb2d23dad395891b00 url - http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.180841550-linux64-180841550.tar.bz2 + http://downloads.phoenixviewer.com/ogg_vorbis-1.3.3-1.3.6.183570202-linux64-183570202.tar.bz2 name linux64 From 103b520701c126c701e9ffc0693174abdded026e Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 24 Dec 2018 00:28:17 +0000 Subject: [PATCH 06/15] Fix copy/paste silliness --- indra/newview/lldynamictexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 117b8f62d7..af6977d3cd 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -131,7 +131,7 @@ void LLViewerDynamicTexture::preRender(BOOL clear_depth) //llassert(mFullWidth <= 512); gPipeline.allocatePhysicsBuffer(); llassert(mFullWidth <= static_cast(gPipeline.mPhysicsDisplay.getWidth())); - llassert(mFullWidth <= static_cast(gPipeline.mPhysicsDisplay.getHeight())); + llassert(mFullHeight <= static_cast(gPipeline.mPhysicsDisplay.getHeight())); // if (gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI) if (gGLManager.mHasFramebufferObject && gPipeline.mPhysicsDisplay.isComplete() && !gGLManager.mIsATI) From 33ad5534081e4da09841f5b9036419e265443b17 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 24 Dec 2018 00:39:55 +0000 Subject: [PATCH 07/15] FIRE-23367/FIRE-23387 - Allow "deliberate" degenerate placeholders --- indra/newview/llfloatermodelpreview.cpp | 30 +++++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 77a68b82ba..3cb47ef129 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3063,19 +3063,35 @@ void LLModelPreview::updateStatusMessages() U16 index_a = face.mIndices[k+0]; U16 index_b = face.mIndices[k+1]; U16 index_c = face.mIndices[k+2]; + // FIRE-23367/23387 - Allow forced empty triangle placeholders created by the LOD processing. + // LLVector4a v1; v1.setMul(face.mPositions[index_a], scale); + // LLVector4a v2; v2.setMul(face.mPositions[index_b], scale); + // LLVector4a v3; v3.setMul(face.mPositions[index_c], scale); - LLVector4a v1; v1.setMul(face.mPositions[index_a], scale); - LLVector4a v2; v2.setMul(face.mPositions[index_b], scale); - LLVector4a v3; v3.setMul(face.mPositions[index_c], scale); - - if (ll_is_degenerate(v1,v2,v3)) + // if (ll_is_degenerate(v1, v2, v3)) + // { + // mHasDegenerate = true;// make has_degenerate a member + // } + // else + // { + // k += 3; + // } + if (index_c == 0 && index_b == 0 && index_a == 0) // test in reverse as 3rd index is less likely to be 0 in a normal case { - mHasDegenerate = true;// make has_degenerate a member + LL_DEBUGS("MeshValidation") << "Empty placeholder triangle (3 identical index 0 verts) ignored" << LL_ENDL; } else { - k += 3; + LLVector4a v1; v1.setMul(face.mPositions[index_a], scale); + LLVector4a v2; v2.setMul(face.mPositions[index_b], scale); + LLVector4a v3; v3.setMul(face.mPositions[index_c], scale); + if (ll_is_degenerate(v1, v2, v3)) + { + mHasDegenerate = true;// make has_degenerate a member + } } + k += 3; + // } } } From c7c336594270e9ec4de3688f9fb441d7eb6c9b5c Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 24 Dec 2018 01:12:26 +0000 Subject: [PATCH 08/15] Allow override of client side mesh validation as workaround for edge cases and different grid validation. Effectively restores previous server side MAV error dialogues alongside clientside warnings. --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- indra/newview/llfloatermodelpreview.cpp | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a611bc0a14..7613c49e3f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -18933,7 +18933,18 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 - FSIgnoreFinishAnimation + FSIgnoreClientsideMeshValidation + + Comment + Treat the errors from Clientside mesh validation as warnings and do not block upload. This setting allows you to fall back on server side checks and per Grid quality control levels. + Persist + 1 + Type + Boolean + Value + 0 + + FSIgnoreFinishAnimation Comment Disable the wait for pre-jump or landing. Credit to Zwagoth Klaar for coding this. diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 3cb47ef129..3ded9816fd 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3338,7 +3338,7 @@ void LLModelPreview::updateStatusMessages() //if (!mModelNoErrors || mHasDegenerate) //{ // mFMP->childDisable("ok_btn"); - if (!mModelNoErrors || (has_physics_error > PhysicsError::NOHAVOK)) // block for all cases of phsyics error except NOHAVOK + if ((gSavedSettings.getBOOL("FSIgnoreClientsideMeshValidation")==FALSE) && (!mModelNoErrors || (has_physics_error > PhysicsError::NOHAVOK))) // block for all cases of phsyics error except NOHAVOK { mFMP->childDisable("ok_btn"); mFMP->childDisable("calculate_btn"); From 50a04b2c090b566f264b22f30fd65c822e9f991b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 24 Dec 2018 23:18:32 +0100 Subject: [PATCH 09/15] FIRE-23404: Fix copy&paste error in Italian translation --- indra/newview/skins/default/xui/it/notifications.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 6e11be94cb..84fd135896 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -2471,8 +2471,8 @@ URL: [MEDIAURL] Questo lotto fornisce musica da : -Dominio: [MEDIADOMAIN] -URL: [MEDIAURL] +Dominio: [AUDIODOMAIN] +URL: [AUDIOURL]