diff options
| author | John Hurliman | 2009-10-14 11:44:17 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-14 11:44:17 -0700 |
| commit | 4b5a2f8c024b63f75b122916f6322f2f04d79f42 (patch) | |
| tree | e4c3b1d086a70c6d50b91bca6f61a08b77b65188 /OpenSim/Data | |
| parent | * Minimized the number of times textures are pulled off the priority queue (diff) | |
| parent | Merge branch 'master' into htb-throttle (diff) | |
| download | opensim-SC_OLD-4b5a2f8c024b63f75b122916f6322f2f04d79f42.zip opensim-SC_OLD-4b5a2f8c024b63f75b122916f6322f2f04d79f42.tar.gz opensim-SC_OLD-4b5a2f8c024b63f75b122916f6322f2f04d79f42.tar.bz2 opensim-SC_OLD-4b5a2f8c024b63f75b122916f6322f2f04d79f42.tar.xz | |
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 5 |
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) |