1
0
mirror of https://github.com/anope/anope.git synced 2026-06-29 20:46:39 +02:00

Merge commit 'trunk' into anopeng (1.8 updates, etc)

Conflicts:

	src/main.c
	src/mysql.c
	version.log


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1504 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-11-03 00:01:19 +00:00
parent a765a1155f
commit eda1fca43e
24 changed files with 7722 additions and 6691 deletions
+9 -2
View File
@@ -364,9 +364,16 @@ int do_stats(User * u)
get_chanserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_CHANSERV_MEM, count,
(mem + 512) / 1024);
get_botserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count,
if (s_BotServ) {
get_botserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count,
(mem + 512) / 1024);
}
if (s_HostServ) {
get_hostserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count,
(mem + 512) / 1024);
}
get_operserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_OPERSERV_MEM, count,
(mem + 512) / 1024);