Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-12-09 21:27:32 +00:00
23 changed files with 1356 additions and 94 deletions

View File

@@ -53,5 +53,6 @@ namespace OpenSim.Data
bool ReportAgent(UUID sessionID, UUID regionID);
PresenceData[] Get(string field, string data);
bool Delete(string field, string val);
bool VerifyAgent(UUID agentId, UUID secureSessionID);
}
}

View File

@@ -100,5 +100,18 @@ namespace OpenSim.Data.MSSQL
return true;
}
public bool VerifyAgent(UUID agentId, UUID secureSessionID)
{
PresenceData[] ret = Get("SecureSessionID",
secureSessionID.ToString());
if (ret.Length == 0)
return false;
if(ret[0].UserID != agentId.ToString())
return false;
return true;
}
}
}

View File

@@ -95,5 +95,19 @@ namespace OpenSim.Data.MySQL
return true;
}
public bool VerifyAgent(UUID agentId, UUID secureSessionID)
{
PresenceData[] ret = Get("SecureSessionID",
secureSessionID.ToString());
if (ret.Length == 0)
return false;
if(ret[0].UserID != agentId.ToString())
return false;
return true;
}
}
}

View File

@@ -222,5 +222,13 @@ namespace OpenSim.Data.Null
return true;
}
public bool VerifyAgent(UUID agentId, UUID secureSessionID)
{
if (Instance != this)
return Instance.VerifyAgent(agentId, secureSessionID);
return false;
}
}
}