From 46ee03817c719d035676e7611487f77863f59c6a Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 6 Aug 2019 02:28:30 +1000 Subject: Maybe now we can properly count locals and hypergridders on the web page? --- OpenSim/Server/Handlers/Web/WebServerInConnector.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'OpenSim/Server/Handlers/Web/WebServerInConnector.cs') diff --git a/OpenSim/Server/Handlers/Web/WebServerInConnector.cs b/OpenSim/Server/Handlers/Web/WebServerInConnector.cs index 01c74fe..52ee9ae 100644 --- a/OpenSim/Server/Handlers/Web/WebServerInConnector.cs +++ b/OpenSim/Server/Handlers/Web/WebServerInConnector.cs @@ -118,19 +118,16 @@ namespace OpenSim.Server.Handlers.Web private Hashtable WebRequestHandler(Hashtable request) { - long locIn = m_Database.GetCount("Presence", "RegionID != '00000000-0000-0000-0000-000000000000'"); // Locals online but not HGing. -// long HGin = m_Database.GetCount("hg_traveling_data", "GridExternalName = '" + ssi["uri"] + "'"); // HGers in world, and locals not HGing, sometimes more than once. + long locIn = m_Database.GetCount("Presence", "RegionID != '00000000-0000-0000-0000-000000000000'"); // Locals online but not HGing, and HGers in world. + long HGin = m_Database.GetCount("Presence", "UserID NOT IN (SELECT PrincipalID FROM UserAccounts)"); // HGers in world. long locOut = m_Database.GetCount("hg_traveling_data", "GridExternalName != '" + ssi["uri"] + "'"); // Locals that are HGing. Hashtable reply = new Hashtable(); ssi["members"] = m_Database.GetCount("UserAccounts").ToString(); ssi["sims"] = m_Database.GetCount("regions").ToString(); - ssi["inworld"] = locIn.ToString(); + ssi["inworld"] = (locIn - HGin).ToString(); ssi["outworld"] = locOut.ToString(); -// ssi["hgers"] = HGin.ToString(); - ssi["hgers"] = "?"; + ssi["hgers"] = HGin.ToString(); ssi["month"] = m_Database.GetCount("GridUser", "Login > UNIX_TIMESTAMP(FROM_UNIXTIME(UNIX_TIMESTAMP(now()) - 2419200))").ToString(); - // SELECT COUNT(UserID) FROM Presence WHERE LastSeen < one month ago 2017-11-28 09:01:51; This is not accurate, and never has been. - // SELECT COUNT(UserID) FROM {GridUser} WHERE Login > UNIX_TIMESTAMP(FROM_UNIXTIME(UNIX_TIMESTAMP(now()) - 2419200) string reqpath = (string) request["uri"]; string[] query = (string[]) request["querystringkeys"]; -- cgit v1.1