aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2009-10-14 05:10:43 +0100
committerMelanie2009-10-14 05:10:43 +0100
commitd83ace0d3ba3178aab852ae4ed63ea3953ea7c52 (patch)
tree56575e321d60daaf36fa5b3261f4ed9154826566 /OpenSim/Data
parent* Split Task category into Task and State (diff)
parentSet the estate owner to be the master avatar if it's not set. (diff)
downloadopensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.zip
opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.tar.gz
opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.tar.bz2
opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 3b561d1..f514076 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -151,7 +151,10 @@ namespace OpenSim.Data.MySQL
151 151
152 DataTable schemaTable = result.GetSchemaTable(); 152 DataTable schemaTable = result.GetSchemaTable();
153 foreach (DataRow row in schemaTable.Rows) 153 foreach (DataRow row in schemaTable.Rows)
154 m_ColumnNames.Add(row["ColumnName"].ToString()); 154 {
155 if (row["ColumnName"] != null)
156 m_ColumnNames.Add(row["ColumnName"].ToString());
157 }
155 } 158 }
156 159
157 foreach (string s in m_ColumnNames) 160 foreach (string s in m_ColumnNames)