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/llstartup.cpp

@@ -660,17 +660,6 @@ bool idle_startup()
 		{
 			gAudiop = NULL;
 
-#ifdef LL_OPENAL
-			if (!gAudiop
-#if !LL_WINDOWS
-			    && NULL == getenv("LL_BAD_OPENAL_DRIVER")
-#endif // !LL_WINDOWS
-			    )
-			{
-				gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
-			}
-#endif
-
 #ifdef LL_FMODEX		
 			if (!gAudiop
 #if !LL_WINDOWS
@@ -682,6 +671,17 @@ bool idle_startup()
 			}
 #endif
 
+#ifdef LL_OPENAL
+			if (!gAudiop
+#if !LL_WINDOWS
+			    && NULL == getenv("LL_BAD_OPENAL_DRIVER")
+#endif // !LL_WINDOWS
+			    )
+			{
+				gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
+			}
+#endif
+
 #ifdef LL_FMOD			
 			if (!gAudiop
 #if !LL_WINDOWS
@@ -4288,11 +4288,13 @@ bool process_login_success_response(std::string& password)
 			gMoonTextureID = id;
 		}
 
+#if ENABLE_CLASSIC_CLOUDS
 		id = global_textures["cloud_texture_id"];
 		if(id.notNull())
 		{
 			gCloudTextureID = id;
 		}
+#endif
 	}