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
+
diff --git a/autobuild.xml b/autobuild.xml
index df798d72fe..e7eec7ee20 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1753,11 +1753,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d9a86fe36bada5011c25919715ed83ae</string>
+              <string>57bbb4defb7986aa241b10558c6abfea</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602180356-r57.tar.bz2</string>
+              <string>http://downloads.phoenixviewer.com/llceflib-1.0-linux-201603010220-r58.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
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
 		}
 	}
 
-	// <FS:NS> See if the requested URL matches a X-LL-URL header (if present) and the requested range.
+	// <FS:ND> 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/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 79e6632b92..0bdbbad338 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -967,7 +967,7 @@ void MediaPluginCEF::unicodeInput(const std::string &utf8str, LLCEFLib::EKeyboar
 #endif
 
 // <FS:ND> 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;
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";
 		}
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
 	};
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 12e6db0aea..d7c892ee6f 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();
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index da29f3f9e0..d2fae10cbe 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1688,7 +1688,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
 			LL_WARNS() << "Detected NaN for decode priority" << LL_ENDL;
 			mDecodePriority = 0; // What to put here? Something low? high? zero?
 		}
-		// </FS:NS>
+		// </FS:ND>
 
 		return mDecodePriority; // no change while waiting to create
 	}
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index f767faa2cb..64cfa133f3 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5251,7 +5251,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 						}
 						else
 						{
-							// <FS:NS> Even more crash avoidance ...
+							// <FS:ND> Even more crash avoidance ...
 							// if (te->getColor().mV[3] > 0.f)
 							if (te && te->getColor().mV[3] > 0.f)
 							// </FS:ND>
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