Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/3d/driver/opengl/unix_event_emitter.cpp

@@ -83,8 +83,6 @@ void CUnixEventEmitter::createIM()
 {
 #ifdef X_HAVE_UTF8_STRING
 
-	XModifierKeymap *g_mod_map = XGetModifierMapping(_dpy);
-
 	_im = XOpenIM(_dpy, NULL, NULL, NULL);
 
 	if (_im == NULL)

code/nel/src/gui/group_html.cpp

@@ -698,6 +698,8 @@ namespace NLGUI
 							}
 							requestTerminated();
 						}
+
+						continue;
 					}
 
 					for (vector<CDataDownload>::iterator it=Curls.begin(); it<Curls.end(); it++)
@@ -871,8 +873,20 @@ namespace NLGUI
 	#ifdef LOG_DL
 		nlwarning("Release Downloads");
 	#endif
+
+		// remove all queued and already started downloads
+		for (uint i = 0; i < Curls.size(); ++i)
+		{
+			if (Curls[i].data)
+			{
 				if (MultiCurl)
-			curl_multi_cleanup(MultiCurl);
+					curl_multi_remove_handle(MultiCurl, Curls[i].data->Request);
+
+				// release CCurlWWWData
+				delete Curls[i].data;
+			}
+		}
+		Curls.clear();
 	}
 
 	class CGroupListAdaptor : public CInterfaceGroup
@@ -3059,8 +3073,13 @@ namespace NLGUI
 					   //     this is why the call to 'updateRefreshButton' has been removed from stopBrowse
 
 		clearContext();
+		releaseDownloads();
+
 		if (_CurlWWW)
 			delete _CurlWWW;
+
+		if(MultiCurl)
+			curl_multi_cleanup(MultiCurl);
 	}
 
 	std::string CGroupHTML::getProperty( const std::string &name ) const

code/ryzom/client/src/light_cycle_manager.cpp

@@ -346,7 +346,7 @@ void CLightCycleManager::setHour(float hour, const CWeatherManagerClient &wm, NL
 
 
 	// Set the Sun color only if not indoor
-	if (ContinentMngr.cur()->Indoor)
+	if (ContinentMngr.cur() && ContinentMngr.cur()->Indoor)
 	{
 		Scene->setSunAmbient(CRGBA(150, 150, 150, 255));
 	}