From 71b20639d59b6c5621c950907a8f6e91b474535a Mon Sep 17 00:00:00 2001 From: Nicky Date: Sat, 20 Apr 2019 09:37:04 +0200 Subject: [PATCH 1/7] Adjust GCC tests to lower GCC version. --- indra/llmath/llcalc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llmath/llcalc.cpp b/indra/llmath/llcalc.cpp index f063b877a5..f244937bf6 100644 --- a/indra/llmath/llcalc.cpp +++ b/indra/llmath/llcalc.cpp @@ -24,10 +24,10 @@ * */ -// Disable some warnings on newer GCC versions. (Camd with GCC >= 8.2 +// Disable some warnings on newer GCC versions. (Camd with GCC >= 7.3 #if LL_LINUX #pragma GCC diagnostic ignored "-Wuninitialized" - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 80200 + #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 70300 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif #endif From fd0f8a1cf50ff2d8551b99f1889cf0b0d034e77d Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 20 Apr 2019 19:31:01 -0500 Subject: [PATCH 2/7] OS X compile fixes. --- indra/llui/lllayoutstack.cpp | 1 - indra/newview/llappearancemgr.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 577fa7d691..81cbc532e2 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -587,7 +587,6 @@ LLLayoutPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const { if (!panelp) return NULL; - e_panel_list_t::const_iterator panel_it; BOOST_FOREACH(LLLayoutPanel* p, mPanels) { if (p == panelp) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index dc781ff086..2c0fc9de77 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1970,7 +1970,6 @@ bool LLAppearanceMgr::getCanRemoveOutfit(const LLUUID& outfit_cat_id) LLFindNonRemovableObjects filter_non_removable; LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - LLInventoryModel::item_array_t::const_iterator it; gInventory.collectDescendentsIf(outfit_cat_id, cats, items, false, filter_non_removable); if (!cats.empty() || !items.empty()) { From eca9f2bbe629a927ce3e5502923843e2fd299650 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 21 Apr 2019 23:32:42 +0200 Subject: [PATCH 3/7] Linux: Update readme for x64 builds. --- README_BUILD_FIRESTORM_LINUX.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt index 4a8595363e..8b1eec1314 100755 --- a/README_BUILD_FIRESTORM_LINUX.txt +++ b/README_BUILD_FIRESTORM_LINUX.txt @@ -20,16 +20,16 @@ Available premade firestorm-specific build targets: RelWithDebInfoFS_open (no KDU, no FMODEX) To build firestorm: - autobuild build -c ReleaseFS + autobuild build -A64 -c ReleaseFS Other examples: - autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure - autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure - autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel + autobuild configure -A64 -c ReleaseFS # basic configuration step, don't build, just configure + autobuild configure -A64 -c ReleaseFS -- --clean # clean the output area first, then configure + autobuild configure -A64 -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - autobuild build -c ReleaseFS --no-configure # default quick rebuild - autobuild build -c ReleaseFS --no-configure -- --clean # Clean rebuild - autobuild build -c ReleaseFS -- --package # Complete a build and package it into a tarball + autobuild build -A64 -c ReleaseFS --no-configure # default quick rebuild + autobuild build -A64 -c ReleaseFS --no-configure -- --clean # Clean rebuild + autobuild build -A64 -c ReleaseFS -- --package # Complete a build and package it into a tarball Any of the configure options can also be used (and do the same thing) with the build options. Typical LL autobuild configure options should also work, as long as they don't duplicate configuration we are @@ -37,9 +37,9 @@ already doing. Logs: - Look for logs in build-linux-i686/logs + Look for logs in build-linux-x86_64/logs Output: - Look for output in build-linux-i686/newview/Release + Look for output in build-linux-x86_64/newview/Release From 96f5fc7ce62fd143607f8c3f15acf84ac08c0e5c Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Mon, 22 Apr 2019 16:32:15 +0300 Subject: [PATCH 4/7] SL-10952 - Look at performance impact of selection outline changes SL-10973 - [Love Me Render] Mesh Child Prims in Linkset are now Yellow instead of Blue - Fixed --- indra/newview/llface.cpp | 49 +------------------- indra/newview/llface.h | 2 +- indra/newview/llselectmgr.cpp | 86 ++++++++++++++++++++++++++++------- 3 files changed, 72 insertions(+), 65 deletions(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 3854f4adbc..354a6aa402 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -638,15 +638,10 @@ void renderFace(LLDrawable* drawable, LLFace *face) LLVOVolume* vobj = drawable->getVOVolume(); if (vobj) { - LLVertexBuffer::unbind(); - gGL.pushMatrix(); - gGL.multMatrix((F32*)vobj->getRelativeXform().mMatrix); - LLVolume* volume = NULL; if (drawable->isState(LLDrawable::RIGGED)) { - vobj->updateRiggedVolume(); volume = vobj->getRiggedVolume(); } else @@ -661,44 +656,11 @@ void renderFace(LLDrawable* drawable, LLFace *face) //LLVertexBuffer::drawElements(LLRender::TRIANGLES, vol_face.mPositions, NULL, vol_face.mNumIndices, vol_face.mIndices); LLVertexBuffer::drawElements(LLRender::TRIANGLES, vol_face.mNumVertices, vol_face.mPositions, NULL, vol_face.mNumIndices, vol_face.mIndices); } - - gGL.popMatrix(); } } -void LLFace::renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wireframe_selection, bool bRenderHiddenSelections) +void LLFace::renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wireframe_selection, bool bRenderHiddenSelections, bool shader) { - //Need to because crash on ATI 3800 (and similar cards) MAINT-5018 - LLGLDisable multisample(LLPipeline::RenderFSAASamples > 0 ? GL_MULTISAMPLE_ARB : 0); - - LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; - - if (shader) - { - gDebugProgram.bind(); - } - - gGL.matrixMode(LLRender::MM_MODELVIEW); - gGL.pushMatrix(); - - BOOL is_hud_object = mVObjp->isHUDAttachment(); - - if (mDrawablep->isActive()) - { - gGL.loadMatrix(gGLModelView); - gGL.multMatrix((F32*)mVObjp->getRenderMatrix().mMatrix); - } - else if (!is_hud_object) - { - gGL.loadIdentity(); - gGL.multMatrix(gGLModelView); - LLVector3 trans = mVObjp->getRegion()->getOriginAgent(); - gGL.translatef(trans.mV[0], trans.mV[1], trans.mV[2]); - } - - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - - if (bRenderHiddenSelections) { gGL.blendFunc(LLRender::BF_SOURCE_COLOR, LLRender::BF_ONE); @@ -754,15 +716,6 @@ void LLFace::renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wirefram glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); renderFace(mDrawablep, this); } - - glLineWidth(1.f); - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - gGL.popMatrix(); - - if (shader) - { - shader->bind(); - } } /* removed in lieu of raycast uv detection diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 1a399b4e09..becf40ff26 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -201,7 +201,7 @@ public: void renderSelectedUV(); void renderSelected(LLViewerTexture *image, const LLColor4 &color); - void renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wireframe_selection, bool bRenderHiddenSelections); + void renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wireframe_selection, bool bRenderHiddenSelections, bool shader); F32 getKey() const { return mDistance; } diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index b4722acfa9..fddcc8d449 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -197,7 +197,7 @@ LLSelectMgr::LLSelectMgr() sHighlightThickness = gSavedSettings.getF32("SelectionHighlightThickness"); sHighlightUScale = gSavedSettings.getF32("SelectionHighlightUScale"); sHighlightVScale = gSavedSettings.getF32("SelectionHighlightVScale"); - sHighlightAlpha = gSavedSettings.getF32("SelectionHighlightAlpha"); + sHighlightAlpha = gSavedSettings.getF32("SelectionHighlightAlpha") * 2; sHighlightAlphaTest = gSavedSettings.getF32("SelectionHighlightAlphaTest"); sHighlightUAnim = gSavedSettings.getF32("SelectionHighlightUAnim"); sHighlightVAnim = gSavedSettings.getF32("SelectionHighlightVAnim"); @@ -6062,6 +6062,9 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) bool wireframe_selection = (gFloaterTools && gFloaterTools->getVisible()) || LLSelectMgr::sRenderHiddenSelections; F32 fogCfx = (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal() - gAgentCamera.getCameraPositionGlobal()).magVec() / (LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec() * 4), 0.0, 1.0); + static LLColor4 sParentColor = LLColor4(sSilhouetteParentColor[VRED], sSilhouetteParentColor[VGREEN], sSilhouetteParentColor[VBLUE], LLSelectMgr::sHighlightAlpha); + static LLColor4 sChildColor = LLColor4(sSilhouetteChildColor[VRED], sSilhouetteChildColor[VGREEN], sSilhouetteChildColor[VBLUE], LLSelectMgr::sHighlightAlpha); + LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getFocusedObjectID(); // Improve selection silhouette rendering speed by Drake Arconis //for (S32 pass = 0; pass < 2; pass++) @@ -6070,33 +6073,84 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) iter != mSelectedObjects->end(); iter++) { LLSelectNode* node = *iter; + + if (getTEMode() && !node->hasSelectedTE()) + continue; + LLViewerObject* objectp = node->getObject(); if (!objectp) continue; - if(getTEMode() && !node->hasSelectedTE()) - continue; - if (objectp->mDrawable && objectp->mDrawable->getVOVolume() && objectp->mDrawable->getVOVolume()->isMesh()) { + //Need to because crash on ATI 3800 (and similar cards) MAINT-5018 + LLGLDisable multisample(LLPipeline::RenderFSAASamples > 0 ? GL_MULTISAMPLE_ARB : 0); + + LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; + + if (shader) + { + gDebugProgram.bind(); + } + + gGL.matrixMode(LLRender::MM_MODELVIEW); + gGL.pushMatrix(); + + BOOL is_hud_object = objectp->isHUDAttachment(); + + if (objectp->mDrawable->isActive()) + { + gGL.loadMatrix(gGLModelView); + gGL.multMatrix((F32*)objectp->getRenderMatrix().mMatrix); + } + else if (!is_hud_object) + { + gGL.loadIdentity(); + gGL.multMatrix(gGLModelView); + LLVector3 trans = objectp->getRegion()->getOriginAgent(); + gGL.translatef(trans.mV[0], trans.mV[1], trans.mV[2]); + } + + LLColor4 hlColor = objectp->isRootEdit() ? sParentColor : sChildColor; + bool bRenderHidenSelection = node->isTransient() ? false : LLSelectMgr::sRenderHiddenSelections; + + + LLVOVolume* vobj = objectp->mDrawable->getVOVolume(); + if (vobj) + { + LLVertexBuffer::unbind(); + gGL.pushMatrix(); + gGL.multMatrix((F32*)vobj->getRelativeXform().mMatrix); + + if (objectp->mDrawable->isState(LLDrawable::RIGGED)) + { + vobj->updateRiggedVolume(); + } + } + + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + S32 num_tes = llmin((S32)objectp->getNumTEs(), (S32)objectp->getNumFaces()); // avatars have TEs but no faces for (S32 te = 0; te < num_tes; ++te) { - if (!getTEMode()) + if (node->isTESelected(te)) { - objectp->mDrawable->getFace(te)->renderOneWireframe( - LLColor4(sSilhouetteParentColor[VRED], sSilhouetteParentColor[VGREEN], sSilhouetteParentColor[VBLUE], LLSelectMgr::sHighlightAlpha * 2) - , fogCfx, wireframe_selection, node->isTransient() ? FALSE : LLSelectMgr::sRenderHiddenSelections); - } - else if(node->isTESelected(te)) - { - objectp->mDrawable->getFace(te)->renderOneWireframe( - LLColor4(sSilhouetteParentColor[VRED], sSilhouetteParentColor[VGREEN], sSilhouetteParentColor[VBLUE], LLSelectMgr::sHighlightAlpha * 2) - , fogCfx, wireframe_selection, node->isTransient() ? FALSE : LLSelectMgr::sRenderHiddenSelections); + objectp->mDrawable->getFace(te)->renderOneWireframe(hlColor, fogCfx, wireframe_selection, bRenderHidenSelection, nullptr != shader); } } + + gGL.popMatrix(); + gGL.popMatrix(); + + glLineWidth(1.f); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + + if (shader) + { + shader->bind(); + } } else { @@ -6671,7 +6725,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &aColor) gGL.texCoord2fv(tc[0].mV); gGL.vertex3fv( v[0].mV ); - gGL.color4f(color.mV[VRED]*2, color.mV[VGREEN]*2, color.mV[VBLUE]*2, LLSelectMgr::sHighlightAlpha*2); + gGL.color4f(color.mV[VRED]*2, color.mV[VGREEN]*2, color.mV[VBLUE]*2, LLSelectMgr::sHighlightAlpha); gGL.texCoord2fv( tc[1].mV ); gGL.vertex3fv( v[1].mV ); @@ -6681,7 +6735,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &aColor) gGL.vertex3fv( v[2].mV ); - gGL.color4f(color.mV[VRED]*2, color.mV[VGREEN]*2, color.mV[VBLUE]*2, LLSelectMgr::sHighlightAlpha*2); + gGL.color4f(color.mV[VRED]*2, color.mV[VGREEN]*2, color.mV[VBLUE]*2, LLSelectMgr::sHighlightAlpha); gGL.texCoord2fv( tc[1].mV ); gGL.vertex3fv( v[1].mV ); From 27ebf0dc6344a16c6829283514dab12a2ed7045a Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Wed, 24 Apr 2019 18:20:34 +0300 Subject: [PATCH 5/7] =?UTF-8?q?SL-10811=20-=20[Render][OSX]=20Google=C3=A2?= =?UTF-8?q?=E2=82=AC=E2=84=A2s=20search=20results=20page=20is=20not=20full?= =?UTF-8?q?y=20displayed=20in=20the=20Media=20Browser=20if=20HiDPI=20is=20?= =?UTF-8?q?enabled.=20SL-10813=20-=20[Render][OSX]=20HiDPI=20browser=20has?= =?UTF-8?q?=20black=20bars=20on=20the=20sides.=20Fixed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/llplugin/llpluginclassmedia.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index feb5d86852..c08b636b30 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -33,7 +33,10 @@ #include "llpluginmessageclasses.h" #include "llcontrol.h" -extern LLControlGroup gSavedSettings; +extern LLControlGroup gSavedSettings; +#if LL_DARWIN +extern BOOL gHiDPISupport; +#endif static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256; @@ -365,11 +368,16 @@ void LLPluginClassMedia::setSizeInternal(void) mRequestedMediaHeight = nextPowerOf2(mRequestedMediaHeight); } - if(mRequestedMediaWidth > 2048) - mRequestedMediaWidth = 2048; +#if LL_DARWIN + if (!gHiDPISupport) +#endif + { + if (mRequestedMediaWidth > 2048) + mRequestedMediaWidth = 2048; - if(mRequestedMediaHeight > 2048) - mRequestedMediaHeight = 2048; + if (mRequestedMediaHeight > 2048) + mRequestedMediaHeight = 2048; + } } void LLPluginClassMedia::setAutoScale(bool auto_scale) From f732cf7debd506437c5286047a14589525daa0bf Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 27 Apr 2019 22:26:48 +0200 Subject: [PATCH 6/7] Polish translation update --- .../default/xui/pl/floater_about_land.xml | 18 +++++- .../default/xui/pl/floater_ban_duration.xml | 14 +++++ .../skins/default/xui/pl/notifications.xml | 24 ++++++++ .../default/xui/pl/panel_region_access.xml | 60 +++++++++++++++++++ .../default/xui/pl/panel_region_estate.xml | 24 +------- .../newview/skins/default/xui/pl/strings.xml | 12 ++++ 6 files changed, 127 insertions(+), 25 deletions(-) create mode 100644 indra/newview/skins/default/xui/pl/floater_ban_duration.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_region_access.xml diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index 128130f699..7706e79f13 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -1,5 +1,11 @@ + + [HOURS] godz. + + + godz. + [MINUTES] min. @@ -12,6 +18,9 @@ pozostało + + Zawsze + @@ -431,10 +440,13 @@ teksturę: