Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 6cbb2ee..7c23a47 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -148,6 +148,10 @@ namespace OpenSim.Data.MySQL
 
                         foreach (string name in m_Fields.Keys)
                         {
+                            if (reader[name] is DBNull)
+                            {
+                                continue;
+                            }
                             if (m_Fields[name].FieldType == typeof(bool))
                             {
                                 int v = Convert.ToInt32(reader[name]);