diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLGenericTableHandler.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 1a97fee..2269d20 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
| @@ -153,6 +153,11 @@ namespace OpenSim.Data.MySQL | |||
| 153 | UUID.TryParse(reader[name].ToString(), out uuid); | 153 | UUID.TryParse(reader[name].ToString(), out uuid); |
| 154 | m_Fields[name].SetValue(row, uuid); | 154 | m_Fields[name].SetValue(row, uuid); |
| 155 | } | 155 | } |
| 156 | else if (m_Fields[name].GetValue(row) is int) | ||
| 157 | { | ||
| 158 | int v = Convert.ToInt32(reader[name]); | ||
| 159 | m_Fields[name].SetValue(row, v); | ||
| 160 | } | ||
| 156 | else | 161 | else |
| 157 | { | 162 | { |
| 158 | m_Fields[name].SetValue(row, reader[name]); | 163 | m_Fields[name].SetValue(row, reader[name]); |