Merge remote-tracking branch 'siana/master' into curlthreading2

Conflicts:
	indra/llcommon/llstring.cpp
	indra/llmessage/llcurl.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/viewer_manifest.py
	install.xml

Resolved:
	indra/llcommon/llstring.cpp :
		two different ways to work around compile error.
	indra/llmessage/llcurl.cpp :
		this file is no longer used.. I deleted huge
		parts to mark that I implemented that. Siana
		apparently made a few changes in those parts.
	indra/newview/llviewertexturelist.cpp :
		manually copied patch. Mine also removed trailing
		spaces, keeping that.
	indra/newview/viewer_manifest.py:
		Collision with changes from Liru, which have been
		ignored (kept siana/master).
	install.xml:
		Collision with an earlier screw up. I kept the
		fix from siana/master.

indra/newview/llappviewer.cpp

@@ -4038,7 +4038,9 @@ void LLAppViewer::idle()
 	//
 	if (!gNoRender)
 	{
+#if ENABLE_CLASSIC_CLOUDS
 		LLWorld::getInstance()->updateClouds(gFrameDTClamped);
+#endif
 		gSky.propagateHeavenlyBodies(gFrameDTClamped);				// moves sun, moon, and planets
 
 		// Update wind vector 
@@ -4054,9 +4056,10 @@ void LLAppViewer::idle()
 			// Compute average wind and use to drive motion of water
 			
 			average_wind = regionp->mWind.getAverage();
+#if ENABLE_CLASSIC_CLOUDS
 			F32 cloud_density = regionp->mCloudLayer.getDensityRegion(wind_position_region);
-			
 			gSky.setCloudDensityAtAgent(cloud_density);
+#endif
 			gSky.setWind(average_wind);
 			//LLVOWater::setWind(average_wind);
 		}