From af63c7375f1d7521534a06c344f133207a8420fd Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 27 Feb 2016 03:47:54 +0100 Subject: [PATCH 1/7] Fix Firestorm Gateway member missing "Firestorm" prefix in profile account status --- indra/newview/fspanelprofile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp index 3e797b8885..2f3cbe6478 100644 --- a/indra/newview/fspanelprofile.cpp +++ b/indra/newview/fspanelprofile.cpp @@ -500,7 +500,7 @@ void FSPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data { bool separator = false; std::string text; - if (flags & (FSData::DEVELOPER | FSData::SUPPORT | FSData::QA)) + if (flags & (FSData::DEVELOPER | FSData::SUPPORT | FSData::QA | FSData::GATEWAY)) { args["[FIRESTORM]"] = "Firestorm"; } From ab2c252872803d3e414fb65d88a9dfd17fba4f84 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 1 Mar 2016 01:06:29 +0100 Subject: [PATCH 2/7] Prepare for more Linux-CEF keyboard changes. --- indra/media_plugins/cef/media_plugin_cef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 90168cb36c..5cf24caa72 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -945,7 +945,7 @@ void MediaPluginCEF::unicodeInput(const std::string &utf8str, LLCEFLib::EKeyboar #endif // Keyboard handling for Linux. -#if LL_LINUX +#if LL_LINUX && FS_CEFLIB_VERSION <= 7 uint32_t native_scan_code = 0; uint32_t native_virtual_key = 0; uint32_t native_modifiers = 0; From 04a14f55991d9b203697609f6bacbf592aee205d Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 1 Mar 2016 01:08:53 +0100 Subject: [PATCH 3/7] Fix my own typos ... --- indra/llcorehttp/_httplibcurl.cpp | 2 +- indra/newview/llviewertexture.cpp | 2 +- indra/newview/llvovolume.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index 854d048897..db75fe93fb 100755 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -358,7 +358,7 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode } } - // See if the requested URL matches a X-LL-URL header (if present) and the requested range. + // See if the requested URL matches a X-LL-URL header (if present) and the requested range. // If not, we assume http pipelining havng gone out of sync. If yes, yield a 503 status and switch // pipelining off. bool bFailed = false; diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 3f12e8f646..9d88ad9aa8 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1652,7 +1652,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority() LL_WARNS() << "Detected NaN for decode priority" << LL_ENDL; mDecodePriority = 0; // What to put here? Something low? high? zero? } - // + // return mDecodePriority; // no change while waiting to create } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 31cf9f3fe7..93df23cdc1 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5257,7 +5257,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) } else { - // Even more crash avoidance ... + // Even more crash avoidance ... // if (te->getColor().mV[3] > 0.f) if (te && te->getColor().mV[3] > 0.f) // From 651db8c6e86fe4edfea4489c655455f1dce15923 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 2 Mar 2016 00:43:11 +0100 Subject: [PATCH 4/7] Add Slackware path to Pepperflash autodetection. --- indra/newview/llappviewerlinux.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 05f834071b..63910764a0 100755 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -83,6 +83,8 @@ void exportFlashVars() "/usr/lib64/chromium-browser/PepperFlash/", // Gentoo "/usr/lib32/chromium-browser/PepperFlash/", // Gentoo "/opt/google/chrome/PepperFlash/", // Mint 17.3 / XBuntu 14.04, probably works with all Ubuntu flavors of that version. + "/usr/lib/chromium/PepperFlash/", // Slackware + "/usr/lib64/chromium/PepperFlash/", // Slackware "/opt/firestorm/PepperFlash/", // In case someone likes to extract pepperflash from a chrome installer on their own, give them a choice with a predef. directory NULL }; From 686975518e1cdf28d3502422fcccb7b147bd178c Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 3 Mar 2016 00:33:13 +0100 Subject: [PATCH 5/7] Linux: CEF Update. --- autobuild.xml | 4 ++-- package_override_gcc.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index df798d72fe..e7eec7ee20 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1753,11 +1753,11 @@ archive hash - d9a86fe36bada5011c25919715ed83ae + 57bbb4defb7986aa241b10558c6abfea hash_algorithm md5 url - http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602180356-r57.tar.bz2 + http://downloads.phoenixviewer.com/llceflib-1.0-linux-201603010220-r58.tar.bz2 name linux diff --git a/package_override_gcc.ini b/package_override_gcc.ini index 9daba467ed..007f7aaaaf 100644 --- a/package_override_gcc.ini +++ b/package_override_gcc.ini @@ -104,5 +104,5 @@ linux = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251 linux = [llceflib] -linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201602180255-r57.tar.bz2|4eb86000a408d3a6e8b39b8fb1bc98de +linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201603010230-r58.tar.bz2|2693d90782f45e4757ac4d5ce384b8d0 From 55c389999192c3ed5636e12b9dc66212c90c8f31 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 3 Mar 2016 12:56:58 +0100 Subject: [PATCH 6/7] FIRE-17732 / FIRE-17880: Give to #RLV folder from another agent is broken when clicking "Accept" instead of "Show" --- indra/newview/llviewermessage.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ac32c557ec..77830d45b4 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1845,8 +1845,20 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& opener = new LLOpenTaskGroupOffer; send_auto_receive_response(); } - else + else if (mIM == IM_INVENTORY_OFFERED) { +// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.2.0) + if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getForbidGiveToRLV()) && (LLAssetType::AT_CATEGORY == mType) && (mDesc.find(RLV_PUTINV_PREFIX) == 0) ) + { + RlvGiveToRLVAgentOffer* pOfferObserver = new RlvGiveToRLVAgentOffer(mObjectID); + pOfferObserver->startFetch(); + if (pOfferObserver->isFinished()) + pOfferObserver->done(); + else + gInventory.addObserver(pOfferObserver); + } +// [/RLVa:KB] + if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_ACCEPT) { send_auto_receive_response(); From 8d60c97d5ce9d7ad0e762d6de928cb1cc125e826 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 4 Mar 2016 12:34:25 +0100 Subject: [PATCH 7/7] Tip to default. --- README_BUILD_FIRESTORM_LINUX.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt index 7a54f90c03..18e7aef3ee 100755 --- a/README_BUILD_FIRESTORM_LINUX.txt +++ b/README_BUILD_FIRESTORM_LINUX.txt @@ -43,3 +43,4 @@ Logs: Output: Look for output in build-linux-i686/newview/Release +