Merge Firestorm LGPL

Tue, 08 Mar 2016 09:08:56 +0100

author
Ansariel
date
Tue, 08 Mar 2016 09:08:56 +0100
changeset 48917
8af8a10da752
parent 48916
3a87b4065448
parent 48723
e34a1569213c
child 48922
53d35af4c234

Merge Firestorm LGPL

autobuild.xml file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
indra/newview/llviewermessage.cpp file | annotate | diff | revisions
indra/newview/llviewertexture.cpp file | annotate | diff | revisions
indra/newview/llvovolume.cpp file | annotate | diff | revisions
package_override_gcc.ini file | annotate | diff | revisions
     1.1 --- a/README_BUILD_FIRESTORM_LINUX.txt	Tue Mar 08 09:08:20 2016 +0100
     1.2 +++ b/README_BUILD_FIRESTORM_LINUX.txt	Tue Mar 08 09:08:56 2016 +0100
     1.3 @@ -43,3 +43,4 @@
     1.4  
     1.5  Output:
     1.6          Look for output in build-linux-i686/newview/Release
     1.7 +
     2.1 --- a/autobuild.xml	Tue Mar 08 09:08:20 2016 +0100
     2.2 +++ b/autobuild.xml	Tue Mar 08 09:08:56 2016 +0100
     2.3 @@ -1753,11 +1753,11 @@
     2.4              <key>archive</key>
     2.5              <map>
     2.6                <key>hash</key>
     2.7 -              <string>d9a86fe36bada5011c25919715ed83ae</string>
     2.8 +              <string>57bbb4defb7986aa241b10558c6abfea</string>
     2.9                <key>hash_algorithm</key>
    2.10                <string>md5</string>
    2.11                <key>url</key>
    2.12 -              <string>http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602180356-r57.tar.bz2</string>
    2.13 +              <string>http://downloads.phoenixviewer.com/llceflib-1.0-linux-201603010220-r58.tar.bz2</string>
    2.14              </map>
    2.15              <key>name</key>
    2.16              <string>linux</string>
     3.1 --- a/indra/llcorehttp/_httplibcurl.cpp	Tue Mar 08 09:08:20 2016 +0100
     3.2 +++ b/indra/llcorehttp/_httplibcurl.cpp	Tue Mar 08 09:08:56 2016 +0100
     3.3 @@ -358,7 +358,7 @@
     3.4  		}
     3.5  	}
     3.6  
     3.7 -	// <FS:NS> See if the requested URL matches a X-LL-URL header (if present) and the requested range.
     3.8 +	// <FS:ND> See if the requested URL matches a X-LL-URL header (if present) and the requested range.
     3.9  	// If not, we assume http pipelining havng gone out of sync. If yes, yield a 503 status and switch
    3.10  	// pipelining off.
    3.11  	bool bFailed = false;
     4.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Tue Mar 08 09:08:20 2016 +0100
     4.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Tue Mar 08 09:08:56 2016 +0100
     4.3 @@ -967,7 +967,7 @@
     4.4  #endif
     4.5  
     4.6  // <FS:ND> Keyboard handling for Linux.
     4.7 -#if LL_LINUX
     4.8 +#if LL_LINUX && FS_CEFLIB_VERSION <= 7
     4.9  	uint32_t native_scan_code = 0;
    4.10  	uint32_t native_virtual_key = 0;
    4.11  	uint32_t native_modifiers = 0;
     5.1 --- a/indra/newview/fspanelprofile.cpp	Tue Mar 08 09:08:20 2016 +0100
     5.2 +++ b/indra/newview/fspanelprofile.cpp	Tue Mar 08 09:08:56 2016 +0100
     5.3 @@ -500,7 +500,7 @@
     5.4  	{
     5.5  		bool separator = false;
     5.6  		std::string text;
     5.7 -		if (flags & (FSData::DEVELOPER | FSData::SUPPORT | FSData::QA))
     5.8 +		if (flags & (FSData::DEVELOPER | FSData::SUPPORT | FSData::QA | FSData::GATEWAY))
     5.9  		{
    5.10  			args["[FIRESTORM]"] = "Firestorm";
    5.11  		}
     6.1 --- a/indra/newview/llappviewerlinux.cpp	Tue Mar 08 09:08:20 2016 +0100
     6.2 +++ b/indra/newview/llappviewerlinux.cpp	Tue Mar 08 09:08:56 2016 +0100
     6.3 @@ -83,6 +83,8 @@
     6.4  		"/usr/lib64/chromium-browser/PepperFlash/", // Gentoo
     6.5  		"/usr/lib32/chromium-browser/PepperFlash/", // Gentoo
     6.6  		"/opt/google/chrome/PepperFlash/", // Mint 17.3 / XBuntu 14.04, probably works with all Ubuntu flavors of that version.
     6.7 +		"/usr/lib/chromium/PepperFlash/", // Slackware
     6.8 +		"/usr/lib64/chromium/PepperFlash/", // Slackware
     6.9  		"/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
    6.10  		NULL
    6.11  	};
     7.1 --- a/indra/newview/llviewermessage.cpp	Tue Mar 08 09:08:20 2016 +0100
     7.2 +++ b/indra/newview/llviewermessage.cpp	Tue Mar 08 09:08:56 2016 +0100
     7.3 @@ -1845,8 +1845,20 @@
     7.4  			opener = new LLOpenTaskGroupOffer;
     7.5  			send_auto_receive_response();
     7.6  		}
     7.7 -		else
     7.8 -		{
     7.9 +		else if (mIM == IM_INVENTORY_OFFERED)
    7.10 +		{
    7.11 +// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.2.0)
    7.12 +			if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getForbidGiveToRLV()) && (LLAssetType::AT_CATEGORY == mType) && (mDesc.find(RLV_PUTINV_PREFIX) == 0) )
    7.13 +			{
    7.14 +				RlvGiveToRLVAgentOffer* pOfferObserver = new RlvGiveToRLVAgentOffer(mObjectID);
    7.15 +				pOfferObserver->startFetch();
    7.16 +				if (pOfferObserver->isFinished())
    7.17 +					pOfferObserver->done();
    7.18 +				else
    7.19 +					gInventory.addObserver(pOfferObserver);
    7.20 +			}
    7.21 +// [/RLVa:KB]
    7.22 +
    7.23  			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_ACCEPT)
    7.24  			{
    7.25  				send_auto_receive_response();
     8.1 --- a/indra/newview/llviewertexture.cpp	Tue Mar 08 09:08:20 2016 +0100
     8.2 +++ b/indra/newview/llviewertexture.cpp	Tue Mar 08 09:08:56 2016 +0100
     8.3 @@ -1688,7 +1688,7 @@
     8.4  			LL_WARNS() << "Detected NaN for decode priority" << LL_ENDL;
     8.5  			mDecodePriority = 0; // What to put here? Something low? high? zero?
     8.6  		}
     8.7 -		// </FS:NS>
     8.8 +		// </FS:ND>
     8.9  
    8.10  		return mDecodePriority; // no change while waiting to create
    8.11  	}
     9.1 --- a/indra/newview/llvovolume.cpp	Tue Mar 08 09:08:20 2016 +0100
     9.2 +++ b/indra/newview/llvovolume.cpp	Tue Mar 08 09:08:56 2016 +0100
     9.3 @@ -5251,7 +5251,7 @@
     9.4  						}
     9.5  						else
     9.6  						{
     9.7 -							// <FS:NS> Even more crash avoidance ...
     9.8 +							// <FS:ND> Even more crash avoidance ...
     9.9  							// if (te->getColor().mV[3] > 0.f)
    9.10  							if (te && te->getColor().mV[3] > 0.f)
    9.11  							// </FS:ND>
    10.1 --- a/package_override_gcc.ini	Tue Mar 08 09:08:20 2016 +0100
    10.2 +++ b/package_override_gcc.ini	Tue Mar 08 09:08:56 2016 +0100
    10.3 @@ -104,5 +104,5 @@
    10.4  linux =
    10.5  
    10.6  [llceflib]
    10.7 -linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201602180255-r57.tar.bz2|4eb86000a408d3a6e8b39b8fb1bc98de
    10.8 +linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201603010230-r58.tar.bz2|2693d90782f45e4757ac4d5ce384b8d0
    10.9  

mercurial