diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
| commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
| tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Data | |
| parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 4e27e26..2f5937d 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
| @@ -135,7 +135,7 @@ namespace OpenSim.Data.MySQL | |||
| 135 | 135 | ||
| 136 | List<T> result = new List<T>(); | 136 | List<T> result = new List<T>(); |
| 137 | 137 | ||
| 138 | while(reader.Read()) | 138 | while (reader.Read()) |
| 139 | { | 139 | { |
| 140 | T row = new T(); | 140 | T row = new T(); |
| 141 | 141 | ||
| @@ -146,7 +146,7 @@ namespace OpenSim.Data.MySQL | |||
| 146 | int v = Convert.ToInt32(reader[name]); | 146 | int v = Convert.ToInt32(reader[name]); |
| 147 | m_Fields[name].SetValue(row, v != 0 ? true : false); | 147 | m_Fields[name].SetValue(row, v != 0 ? true : false); |
| 148 | } | 148 | } |
| 149 | else if(m_Fields[name].GetValue(row) is UUID) | 149 | else if (m_Fields[name].GetValue(row) is UUID) |
| 150 | { | 150 | { |
| 151 | UUID uuid = UUID.Zero; | 151 | UUID uuid = UUID.Zero; |
| 152 | 152 | ||