Merge with develop

code/ryzom/server/src/ags_test/move_grid.h

@@ -282,10 +282,10 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
 				while ((node = cellNode->NodeList.getHead()) != NULL)
 				{
 					cellNode->NodeList.remove(node);
-					_NodeAllocator.free(node);
+					_NodeAllocator.freeBlock(node);
 				}
 				list.remove(cellNode);
-				_CellNodeAllocator.free(cellNode);
+				_CellNodeAllocator.freeBlock(cellNode);
 			}
 		}
 	}

code/ryzom/server/src/entities_game_service/admin.cpp

@@ -5489,7 +5489,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (command_args.size() > 8)
 		{
 			if (command_args[8] != "*") {
-				NLMISC::fromString(command_args[7], z);
+				NLMISC::fromString(command_args[8], z);
 			}
 		}
 

code/ryzom/server/src/entity_view_service/move_grid.h

@@ -227,7 +227,7 @@ CMoveGrid<T, CELLS, CSIZE>::~CMoveGrid()
 			while ((node = list.getHead()) != NULL)
 			{
 				list.remove(node);
-				_NodeAllocator.free(node);
+				_NodeAllocator.freeBlock(node);
 			}
 		}
 	}
@@ -282,7 +282,7 @@ void	CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
 
 	it._Node = NULL;
 
-	_NodeAllocator.free(node);
+	_NodeAllocator.freeBlock(node);
 }
 
 

code/ryzom/server/src/gpm_service/cell.h

@@ -191,7 +191,7 @@ public:
 	static CCell	*create()				{ return _CellAllocator.allocate(); }
 
 	/// Removes an entity (delete equivalent).
-	static void		remove(CCell *cell)		{ _CellAllocator.free(cell); }
+	static void		remove(CCell *cell)		{ _CellAllocator.freeBlock(cell); }
 
 private:
 

code/ryzom/server/src/gpm_service/move_grid.h

@@ -381,10 +381,10 @@ void	CMoveGrid<T, CELLS, CSIZE>::clear()
 				while ((node = cellNode->NodeList.getHead()) != NULL)
 				{
 					cellNode->NodeList.remove(node);
-					_NodeAllocator.free(node);
+					_NodeAllocator.freeBlock(node);
 				}
 				list.remove(cellNode);
-				_CellNodeAllocator.free(cellNode);
+				_CellNodeAllocator.freeBlock(cellNode);
 			}
 		}
 	}
@@ -482,7 +482,7 @@ void	CMoveGrid<T, CELLS, CSIZE>::remove(CIterator &it)
 	removeNode(it);
 	it._Node = NULL;
 
-	_NodeAllocator.free(node);
+	_NodeAllocator.freeBlock(node);
 }
 
 

code/ryzom/server/src/gpm_service/world_entity.cpp

@@ -67,7 +67,7 @@ void			CWorldEntity::remove(CWorldEntity* entity)
 	{
 		CWorldPositionManager::_PrimitivedList.erase(entity->PrimIterator);
 	}
-	_EntityAllocator.free(entity);
+	_EntityAllocator.freeBlock(entity);
 }
 
 

code/ryzom/server/src/gpm_service/world_entity.h

@@ -461,7 +461,7 @@ public:
 	static CPlayerInfos	*create()				{ return _PlayerAllocator.allocate(); }
 
 	/// Removes an entity (delete equivalent).
-	static void remove(CPlayerInfos *player)	{ _PlayerAllocator.free(player); }
+	static void remove(CPlayerInfos *player)	{ _PlayerAllocator.freeBlock(player); }
 
 private:
 

code/ryzom/server/src/input_output_service/string_manager_parser.cpp

@@ -1864,7 +1864,6 @@ void CStringManager::init(NLMISC::CLog *log)
 	
 	if (_SheetInfo.empty())
 	{
-		// std::map<std::string, TSheetInfo> container;
 		// Load the sheet
 		std::vector<std::string> exts;
 		exts.push_back("creature");