Merge branch 'master' into presence-refactor

This commit is contained in:
Melanie
2010-01-04 21:41:33 +00:00
62 changed files with 1839 additions and 823 deletions

View File

@@ -153,6 +153,11 @@ namespace OpenSim.Data.MySQL
UUID.TryParse(reader[name].ToString(), out uuid);
m_Fields[name].SetValue(row, uuid);
}
else if (m_Fields[name].GetValue(row) is int)
{
int v = Convert.ToInt32(reader[name]);
m_Fields[name].SetValue(row, v);
}
else
{
m_Fields[name].SetValue(row, reader[name]);