diff options
| author | meta7 | 2010-08-20 11:01:03 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-20 11:01:03 -0700 |
| commit | 187ccd72f0883480b1dd027fce99fc99c2803eb6 (patch) | |
| tree | 654e330ec4c46b5b062bae9350e5d4966a0c6873 /OpenSim/Data | |
| parent | Get maturity level from access number. This addresses mantis #269 (diff) | |
| parent | Add some maptile options, change maptile generation from OpenSimBase to Scene (diff) | |
| download | opensim-SC-187ccd72f0883480b1dd027fce99fc99c2803eb6.zip opensim-SC-187ccd72f0883480b1dd027fce99fc99c2803eb6.tar.gz opensim-SC-187ccd72f0883480b1dd027fce99fc99c2803eb6.tar.bz2 opensim-SC-187ccd72f0883480b1dd027fce99fc99c2803eb6.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 4 |
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 | |||
| 148 | 148 | ||
| 149 | foreach (string name in m_Fields.Keys) | 149 | foreach (string name in m_Fields.Keys) |
| 150 | { | 150 | { |
| 151 | if (reader[name] is DBNull) | ||
| 152 | { | ||
| 153 | continue; | ||
| 154 | } | ||
| 151 | if (m_Fields[name].FieldType == typeof(bool)) | 155 | if (m_Fields[name].FieldType == typeof(bool)) |
| 152 | { | 156 | { |
| 153 | int v = Convert.ToInt32(reader[name]); | 157 | int v = Convert.ToInt32(reader[name]); |