* Adds the variables passed to the hashtable BaseHttpServer passes in.

* Null check on Sessions_report.
This commit is contained in:
Teravus Ovares
2009-01-08 22:01:57 +00:00
parent 5169b1f19e
commit fcc3325f3b
3 changed files with 32 additions and 13 deletions

View File

@@ -53,27 +53,31 @@ namespace OpenSim.Region.UserStatistics
List<SessionList> lstSessions = new List<SessionList>();
Hashtable requestvars = (Hashtable) pParams["RequestVars"];
string puserUUID = string.Empty;
string clientVersionString = string.Empty;
int queryparams = 0;
if (requestvars.ContainsKey("UserID"))
if (requestvars != null)
{
UUID testUUID = UUID.Zero;
if (UUID.TryParse(requestvars["UserID"].ToString(), out testUUID))
if (requestvars.ContainsKey("UserID"))
{
puserUUID = requestvars["UserID"].ToString();
UUID testUUID = UUID.Zero;
if (UUID.TryParse(requestvars["UserID"].ToString(), out testUUID))
{
puserUUID = requestvars["UserID"].ToString();
}
}
}
if (requestvars.ContainsKey("VersionString"))
{
UUID testUUID = UUID.Zero;
if (requestvars.ContainsKey("VersionString"))
{
UUID testUUID = UUID.Zero;
clientVersionString = requestvars["VersionString"].ToString();
clientVersionString = requestvars["VersionString"].ToString();
}
}
lock (dbConn)

View File

@@ -203,8 +203,16 @@ namespace OpenSim.Region.UserStatistics
IStatsController rep = reports[regpath];
Hashtable repParams = new Hashtable();
repParams["RequestVars"] = request["requestvars"];
repParams["QueryStringKeys"] = request["querystringkeys"];
if (request.ContainsKey("requestvars"))
repParams["RequestVars"] = request["requestvars"];
else
repParams["RequestVars"] = new Hashtable();
if (request.ContainsKey("querystringkeys"))
repParams["QueryStringKeys"] = request["querystringkeys"];
else
repParams["QueryStringKeys"] = new string[0];
repParams["DatabaseConnection"] = dbConn;
repParams["Scenes"] = m_scene;