Merge with develop

--HG--
branch : compatibility-develop

code/ryzom/server/src/ai_service/commands.cpp

@@ -1686,7 +1686,9 @@ NLMISC_COMMAND(getDatasetId,"get datasetid of bots with name matchiong the given
 		FOREACH(itBot, vector<CBot*>, bots)
 		{
 			CBot* bot = *itBot;
-			DatasetIds += bot->getSpawnObj()->dataSetRow().toString()+"|";
+			CSpawnBot* spawnBot = bot->getSpawnObj();
+			if (spawnBot!=NULL)
+				DatasetIds += spawnBot->dataSetRow().toString()+"|";
 
 		}
 	}

code/ryzom/server/src/ai_service/state_instance.h

@@ -376,7 +376,7 @@ inline
 float CStateInstance::getNelVar(std::string const& varId)
 {
 	TNelVarList::iterator it = _NelVar.find(varId);
-	if (it != _NelVar.end()) return it->second->get()
+	if (it != _NelVar.end()) return it->second->get();
 
 	if (NLMISC::CVariable<float>::exists(varId))
 	{