Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-03-15 17:23:35 +00:00
89 changed files with 13161 additions and 3963 deletions

View File

@@ -197,7 +197,7 @@ namespace OpenSim.Data.MySQL
public virtual T[] Get(string where)
{
using (MySqlCommand cmd = new MySqlCommand())
{
{
string query = String.Format("select * from {0} where {1}",
m_Realm, where);

View File

@@ -54,7 +54,7 @@ namespace OpenSim.Data.MySQL
return null;
return ret[0];
}
}
public bool StoreGridUserData(GridUserData data)
{

View File

@@ -134,7 +134,7 @@ namespace OpenSim.Data.MySQL
List<UUID> deleteSessions = new List<UUID>();
int online = 0;
while(reader.Read())
while (reader.Read())
{
if (bool.Parse(reader["Online"].ToString()))
online++;