From 09cd2ac4437e3905ba48b84e04559a0e606aa679 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Mon, 12 Oct 2009 20:46:19 +0100
Subject: [PATCH] Stop null values from being returned on database queries

---
 OpenSim/Data/MySQL/MySQLRegionData.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 3b561d14ed..f5140761ea 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -151,7 +151,10 @@ namespace OpenSim.Data.MySQL
 
                         DataTable schemaTable = result.GetSchemaTable();
                         foreach (DataRow row in schemaTable.Rows)
-                            m_ColumnNames.Add(row["ColumnName"].ToString());
+                        {
+                            if (row["ColumnName"] != null)
+                                m_ColumnNames.Add(row["ColumnName"].ToString());
+                        }
                     }
 
                     foreach (string s in m_ColumnNames)