From 89184d5e4e0cb2ebcb7818376506e100497bc656 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Fri, 21 Oct 2022 13:13:27 +0200 Subject: [PATCH 01/24] Follow up on last merge for Vintage and Startlight skins --- .../skins/starlight/xui/en/floater_map.xml | 30 +++++++++++++++-- .../skins/starlightcui/xui/en/floater_map.xml | 30 +++++++++++++++-- .../skins/vintage/xui/en/floater_map.xml | 32 ++++++++++++++++--- 3 files changed, 82 insertions(+), 10 deletions(-) diff --git a/indra/newview/skins/starlight/xui/en/floater_map.xml b/indra/newview/skins/starlight/xui/en/floater_map.xml index b7ba4ccca7..6b49bb10b0 100644 --- a/indra/newview/skins/starlight/xui/en/floater_map.xml +++ b/indra/newview/skins/starlight/xui/en/floater_map.xml @@ -22,11 +22,35 @@ - [AGENT][REGION] (Double-click to open Map, shift-drag to pan) + [AGENT][PARCEL_NAME_MSG][PARCEL_SALE_PRICE_MSG][PARCEL_SALE_AREA_MSG][PARCEL_OWNER_MSG][REGION_NAME_MSG][TOOL_TIP_HINT_MSG] + + + [PARCEL_NAME] + + + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) + + + Area: [AREA]m² + + + Owner: [PARCEL_OWNER] + + + Region: [REGION_NAME] - [REGION] (Double-click to teleport, shift-drag to pan) + name="ToolTipHintMsg"> + Double-click to open map + + + Double-click to teleport MINIMAP diff --git a/indra/newview/skins/starlightcui/xui/en/floater_map.xml b/indra/newview/skins/starlightcui/xui/en/floater_map.xml index 4fcb355201..0046276ed8 100644 --- a/indra/newview/skins/starlightcui/xui/en/floater_map.xml +++ b/indra/newview/skins/starlightcui/xui/en/floater_map.xml @@ -21,11 +21,35 @@ - [AGENT][REGION] (Double-click to open Map, shift-drag to pan) + [AGENT][PARCEL_NAME_MSG][PARCEL_SALE_PRICE_MSG][PARCEL_SALE_AREA_MSG][PARCEL_OWNER_MSG][REGION_NAME_MSG][TOOL_TIP_HINT_MSG] + + + [PARCEL_NAME] + + + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) + + + Area: [AREA]m² + + + Owner: [PARCEL_OWNER] + + + Region: [REGION_NAME] - [REGION] (Double-click to teleport, shift-drag to pan) + name="ToolTipHintMsg"> + Double-click to open map + + + Double-click to teleport MINIMAP diff --git a/indra/newview/skins/vintage/xui/en/floater_map.xml b/indra/newview/skins/vintage/xui/en/floater_map.xml index 00bebc1839..9add735daf 100644 --- a/indra/newview/skins/vintage/xui/en/floater_map.xml +++ b/indra/newview/skins/vintage/xui/en/floater_map.xml @@ -21,14 +21,38 @@ - [AGENT][REGION](Double-click to open Map, shift-drag to pan) + [AGENT][PARCEL_NAME_MSG][PARCEL_SALE_PRICE_MSG][PARCEL_SALE_AREA_MSG][PARCEL_OWNER_MSG][REGION_NAME_MSG][TOOL_TIP_HINT_MSG] + + + [PARCEL_NAME] + + + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) + + + Area: [AREA]m² + + + Owner: [PARCEL_OWNER] + + + Region: [REGION_NAME] - [REGION](Double-click to teleport, shift-drag to pan) + name="ToolTipHintMsg"> + Double-click to open map + + + Double-click to teleport - MINIMAP + Mini-map Date: Fri, 21 Oct 2022 23:34:40 +0200 Subject: [PATCH 02/24] Update FMOD Studio to 2.02.09 on Mac --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9cbc672d0f..3d7236a8f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1084,11 +1084,11 @@ archive hash - 082cf96b1fa31030fa9d47113e8574c3 + fec86a4837ae9c6932c10af11851c4d0 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.02.08-darwin64-4.tar.bz2 + file:///opt/firestorm/fmodstudio-2.02.09-darwin64-5.tar.bz2 name darwin From 009a9cc98119560b810f6fd57ee459bb91e4f1b8 Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 21 Oct 2022 23:44:41 +0100 Subject: [PATCH 03/24] Fix mesh physics options --- indra/newview/skins/default/xui/en/floater_model_preview.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 1bef9b6806..e81fb96942 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -851,10 +851,10 @@ Medium Low Lowest - Bounding Box Cube Hexagon User Defined + Bounding Box From file Date: Fri, 21 Oct 2022 01:13:02 +0100 Subject: [PATCH 04/24] [FIRE-32324] Fix for online/offline batched chat notications failing --- indra/newview/llcallingcard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 0ea885d175..51d4e94430 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -803,7 +803,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) // we were tracking someone who went offline deleteTrackingData(); } - } + // } [FIRE-32324] least invasive change move this brace after the if. LL fix should follow sometime soon //[FIX FIRE-3522 : SJ] Notify Online/Offline to Nearby Chat even if chat_notify isnt true // Attempt to speed up things a little @@ -815,6 +815,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) // Look up the name of this agent for the notification LLAvatarNameCache::get(agent_id,boost::bind(&on_avatar_name_cache_notify,_1, _2, online, payload)); } + } // [FIRE-32324] least invasive change move this brace after the if mModifyMask |= LLFriendObserver::ONLINE; instance().notifyObservers(); From cd7293aecde0c0ff3d620ec3a68c9f82d89a2f16 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 17 Oct 2022 15:04:43 +0100 Subject: [PATCH 05/24] [FIRE-32311] Fix for annoying "particles hidden" text Now shows when render debug is in use --- indra/newview/llviewerwindow.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 51b60b9ba2..520064b933 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -835,6 +835,13 @@ public: ypos += y_inc; } + // FIRE-32311 - Only show particle text when showing render debug info (relocate pre-existing change by Liny) + if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES)) + { + addText(xpos, ypos, particle_hiding); + ypos += y_inc; + } + // LLVertexBuffer::sBindCount = LLImageGL::sBindCount = LLVertexBuffer::sSetCount = LLImageGL::sUniqueCount = gPipeline.mNumVisibleNodes = LLPipeline::sVisibleLightCount = 0; @@ -932,14 +939,6 @@ public: } // - // pull the text saying if particles are hidden out from beacons - if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES)) - { - addText(xpos, ypos, particle_hiding); - ypos += y_inc; - } - // - // only display these messages if we are actually rendering beacons at this moment // Always show the beacon text regardless if the floater is visible // ...and if we want to see it From 7786f2bb9c6021859bff7b8b60fa8879d3c45bd8 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 18 Oct 2022 02:14:53 +0100 Subject: [PATCH 06/24] [FIRE-32132] Allow rigged mesh transparency to toggle independently Also added different colours for rigged-blend (orange)/rigged-masked(cyan) ctrl|alt|shift|T toggles the rigged mesh display on/off --- indra/newview/lldrawpoolalpha.cpp | 47 +++++++++++++------ indra/newview/lldrawpoolalpha.h | 1 + indra/newview/llviewermenu.cpp | 22 +++++++++ .../skins/default/xui/en/menu_viewer.xml | 10 ++++ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index dc52ff4f6a..6caecb9dab 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -52,6 +52,7 @@ #include "fsperfstats.h" // performance stats support BOOL LLDrawPoolAlpha::sShowDebugAlpha = FALSE; +BOOL LLDrawPoolAlpha::sShowDebugAlphaRigged = FALSE; #define current_shader (LLGLSLShader::sCurBoundShaderPtr) @@ -300,15 +301,17 @@ void LLDrawPoolAlpha::renderDebugAlpha() gGL.diffuseColor4f(0, 1, 0, 1); pushBatches(LLRenderPass::PASS_INVISIBLE, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); - + // FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled + if (sShowDebugAlphaRigged) + { + // gHighlightProgram.mRiggedVariant->bind(); - gGL.diffuseColor4f(1, 0, 0, 1); - + gGL.diffuseColor4f(0, 1, 0, 1);// FIRE-32132 et al. (can plain PASS_ALPHA_MASK_RIGGED exist?) paint it green if so. pushRiggedBatches(LLRenderPass::PASS_ALPHA_MASK_RIGGED, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); pushRiggedBatches(LLRenderPass::PASS_ALPHA_INVISIBLE_RIGGED, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); // Material alpha mask - gGL.diffuseColor4f(0, 0, 1, 1); + gGL.diffuseColor4f(0, 1, 1, 1);// FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled pushRiggedBatches(LLRenderPass::PASS_MATERIAL_ALPHA_MASK_RIGGED, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); pushRiggedBatches(LLRenderPass::PASS_NORMMAP_MASK_RIGGED, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); pushRiggedBatches(LLRenderPass::PASS_SPECMAP_MASK_RIGGED, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); @@ -317,6 +320,9 @@ void LLDrawPoolAlpha::renderDebugAlpha() gGL.diffuseColor4f(0, 1, 0, 1); pushRiggedBatches(LLRenderPass::PASS_INVISIBLE_RIGGED, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); + // FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled + } + // LLGLSLShader::sCurBoundShaderPtr->unbind(); } } @@ -344,16 +350,6 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) { LLDrawInfo& params = **k; - // Capture render times - if(params.mFace) - { - LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); - if(vobj->isAttachment()) - { - trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); - } - } - // if (params.mParticle) { @@ -361,7 +357,30 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) } bool rigged = (params.mAvatar != nullptr); + // Capture render times + if(params.mFace) + { + LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); + if(vobj->isAttachment()) + { + trackAttachments( vobj, rigged, &ratPtr ); + } + } + // gHighlightProgram.bind(rigged); + // FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled + if (rigged && !sShowDebugAlphaRigged) + { + // if we don't want to show rigged alpha highlights then skip + continue; + } + else if (rigged && sShowDebugAlphaRigged) + { + // if we do and this is rigged then use a different colour + gGL.diffuseColor4f(1, 0.5, 0, 1); + } + else // NB dangling else to drop through to "normal behaviour" + // gGL.diffuseColor4f(1, 0, 0, 1); if (rigged) diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h index fa8ef0f227..c6ea0045cb 100644 --- a/indra/newview/lldrawpoolalpha.h +++ b/indra/newview/lldrawpoolalpha.h @@ -66,6 +66,7 @@ public: bool uploadMatrixPalette(const LLDrawInfo& params); static BOOL sShowDebugAlpha; + static BOOL sShowDebugAlphaRigged; private: LLGLSLShader* target_shader; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 6684b4f69d..c908da3d7e 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -11000,6 +11000,26 @@ class LLViewCheckHighlightTransparent : public view_listener_t return new_value; } }; +// FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled +class LLViewHighlightTransparentRigged : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + LLDrawPoolAlpha::sShowDebugAlphaRigged = !LLDrawPoolAlpha::sShowDebugAlphaRigged; + gPipeline.resetVertexBuffers(); + return true; + } +}; + +class LLViewCheckHighlightTransparentRigged : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + bool new_value = LLDrawPoolAlpha::sShowDebugAlphaRigged; + return new_value; + } +}; +// class LLViewBeaconWidth : public view_listener_t { @@ -12022,6 +12042,7 @@ void initialize_menus() view_listener_t::addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter"); view_listener_t::addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips"); view_listener_t::addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent"); + view_listener_t::addMenu(new LLViewHighlightTransparentRigged(), "View.HighlightTransparentRigged"); // FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled view_listener_t::addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType"); view_listener_t::addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments"); view_listener_t::addMenu(new LLZoomer(1.2f), "View.ZoomOut"); @@ -12038,6 +12059,7 @@ void initialize_menus() view_listener_t::addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam"); view_listener_t::addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips"); view_listener_t::addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); + view_listener_t::addMenu(new LLViewCheckHighlightTransparentRigged(), "View.CheckHighlightTransparentRigged");// FIRE-32132 et al. Allow rigged mesh transparency highlights to be toggled view_listener_t::addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); view_listener_t::addMenu(new LLViewStatusAway(), "View.Status.CheckAway"); view_listener_t::addMenu(new LLViewStatusDoNotDisturb(), "View.Status.CheckDoNotDisturb"); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b3af6637e9..40e637c5d6 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2971,6 +2971,16 @@ + + + + From 05436e76d7043d6009c5ccf28b11cd361a55f3f0 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 22 Oct 2022 21:29:10 +0200 Subject: [PATCH 07/24] Updated Polish translation --- indra/newview/installers/windows/lang_pl.nsi | Bin 15510 -> 15552 bytes .../skins/default/xui/en/floater_map.xml | 12 +++++------ .../skins/default/xui/pl/floater_map.xml | 15 ++++++++++++++ .../default/xui/pl/floater_model_preview.xml | 1 + .../skins/default/xui/pl/menu_mini_map.xml | 19 ++++++++++-------- .../skins/default/xui/pl/menu_viewer.xml | 3 +++ .../default/xui/pl/panel_avatar_list_item.xml | 2 +- .../newview/skins/default/xui/pl/strings.xml | 6 ------ 8 files changed, 37 insertions(+), 21 deletions(-) diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi index e8929e2898a975914a6de84d05df91917157f135..2a8ea7ef1da7d929506a4c4770e02d1ba23342ad 100644 GIT binary patch delta 342 zcmZ8cu}T9$6r2U&Ks+x*6b=hFrZ6FRjbJUY6SS99t2rdOcpEN}a1la&K^};o5%34} z11$0_=_Rv!Ru&8U=FQBTc`v`p)yS`?=f7cX%RK(TD&vvehbF8$k_00PgzIj(AI7NtEgwjZwpTF&o`W7tlO6mXr delta 330 zcmY+Au?_)25QhJVRwG1on=5b%jlu(HL?uy4G>a3LaO8H8YrMoJ9zjc@Rd@r>pz<32 z*=xw=X6|PG`~I1IX6NiSY`T-G^kO71u+UiZL`b0+6U?#2p4s|Zgazv{m4?*_#$6lX zyu;d{3mCNU&<4)Zpq2eL4cBb7wT@% zn)XJXtw|Rz(fv=Z$QRa;kL<8yNRI-A!TV8HPN$ U8QDiuli!5*cCVmzFSZ}$FR@!lX#fBK diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index 94d99d1097..6b914668d4 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -42,16 +42,16 @@ name="RegionNameMsg"> Region: [REGION_NAME] - Double-click to open map - - + Double-click to teleport - - - Mini-map + + + Mini-map + + Cena: [PRICE]L$ ([PRICE_PER_SQM]L$/m²) + + + Obszar: [AREA]m² + + + Właściciel: [PARCEL_OWNER] + + + Podwójny klik by otworzyć mapę + + + Podwójny klik by teleportować + Minimapa diff --git a/indra/newview/skins/default/xui/pl/floater_model_preview.xml b/indra/newview/skins/default/xui/pl/floater_model_preview.xml index f6ee346bb7..81cacc4adc 100644 --- a/indra/newview/skins/default/xui/pl/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_model_preview.xml @@ -128,6 +128,7 @@ Średnie Niskie Najniższe + Bryła brzegowa Sześcian Heksagon Użytkownika diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml index 4c80d98ddf..ffee24fa35 100644 --- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml @@ -40,10 +40,10 @@ - - - - + + + + @@ -55,14 +55,17 @@ - - + + + + - - + + + diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 9adc4d6674..ef62b5ae0a 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -522,6 +522,9 @@ + + + diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml index b8f4108c00..47ce41967a 100644 --- a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml @@ -20,5 +20,5 @@